diff mbox series

[03/21] switch procfs from d_set_d_op() to d_splice_alias_ops()

Message ID 20250224212051.1756517-3-viro@zeniv.linux.org.uk (mailing list archive)
State New
Headers show
Series [01/21] procfs: kill ->proc_dops | expand

Commit Message

Al Viro Feb. 24, 2025, 9:20 p.m. UTC 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/proc/base.c        | 9 +++------
 fs/proc/generic.c     | 8 ++++----
 fs/proc/internal.h    | 3 +--
 fs/proc/namespaces.c  | 3 +--
 fs/proc/proc_sysctl.c | 7 +++----
 5 files changed, 12 insertions(+), 18 deletions(-)

Comments

Christian Brauner Feb. 26, 2025, 8:29 a.m. UTC | #1 
On Mon, Feb 24, 2025 at 09:20:33PM +0000, Al Viro wrote:
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---

Reviewed-by: Christian Brauner <brauner@kernel.org>

>  fs/proc/base.c        | 9 +++------
>  fs/proc/generic.c     | 8 ++++----
>  fs/proc/internal.h    | 3 +--
>  fs/proc/namespaces.c  | 3 +--
>  fs/proc/proc_sysctl.c | 7 +++----
>  5 files changed, 12 insertions(+), 18 deletions(-)
> 
> diff --git a/fs/proc/base.c b/fs/proc/base.c
> index cd89e956c322..397a9f6f463e 100644
> --- a/fs/proc/base.c
> +++ b/fs/proc/base.c
> @@ -2709,8 +2709,7 @@ static struct dentry *proc_pident_instantiate(struct dentry *dentry,
>  		inode->i_fop = p->fop;
>  	ei->op = p->op;
>  	pid_update_inode(task, inode);
> -	d_set_d_op(dentry, &pid_dentry_operations);
> -	return d_splice_alias(inode, dentry);
> +	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
>  }
>  
>  static struct dentry *proc_pident_lookup(struct inode *dir, 
> @@ -3508,8 +3507,7 @@ static struct dentry *proc_pid_instantiate(struct dentry * dentry,
>  	set_nlink(inode, nlink_tgid);
>  	pid_update_inode(task, inode);
>  
> -	d_set_d_op(dentry, &pid_dentry_operations);
> -	return d_splice_alias(inode, dentry);
> +	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
>  }
>  
>  struct dentry *proc_pid_lookup(struct dentry *dentry, unsigned int flags)
> @@ -3813,8 +3811,7 @@ static struct dentry *proc_task_instantiate(struct dentry *dentry,
>  	set_nlink(inode, nlink_tid);
>  	pid_update_inode(task, inode);
>  
> -	d_set_d_op(dentry, &pid_dentry_operations);
> -	return d_splice_alias(inode, dentry);
> +	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
>  }
>  
>  static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
> diff --git a/fs/proc/generic.c b/fs/proc/generic.c
> index 499c2bf67488..774e18372914 100644
> --- a/fs/proc/generic.c
> +++ b/fs/proc/generic.c
> @@ -255,10 +255,10 @@ struct dentry *proc_lookup_de(struct inode *dir, struct dentry *dentry,
>  		if (!inode)
>  			return ERR_PTR(-ENOMEM);
>  		if (de->flags & PROC_ENTRY_FORCE_LOOKUP)
> -			d_set_d_op(dentry, &proc_net_dentry_ops);
> -		else
> -			d_set_d_op(dentry, &proc_misc_dentry_ops);
> -		return d_splice_alias(inode, dentry);
> +			return d_splice_alias_ops(inode, dentry,
> +						  &proc_net_dentry_ops);
> +		return d_splice_alias_ops(inode, dentry,
> +					  &proc_misc_dentry_ops);
>  	}
>  	read_unlock(&proc_subdir_lock);
>  	return ERR_PTR(-ENOENT);
> diff --git a/fs/proc/internal.h b/fs/proc/internal.h
> index 07f75c959173..48410381036b 100644
> --- a/fs/proc/internal.h
> +++ b/fs/proc/internal.h
> @@ -358,7 +358,6 @@ static inline void pde_force_lookup(struct proc_dir_entry *pde)
>  static inline struct dentry *proc_splice_unmountable(struct inode *inode,
>  		struct dentry *dentry, const struct dentry_operations *d_ops)
>  {
> -	d_set_d_op(dentry, d_ops);
>  	dont_mount(dentry);
> -	return d_splice_alias(inode, dentry);
> +	return d_splice_alias_ops(inode, dentry, d_ops);
>  }
> diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
> index c610224faf10..4403a2e20c16 100644
> --- a/fs/proc/namespaces.c
> +++ b/fs/proc/namespaces.c
> @@ -111,8 +111,7 @@ static struct dentry *proc_ns_instantiate(struct dentry *dentry,
>  	ei->ns_ops = ns_ops;
>  	pid_update_inode(task, inode);
>  
> -	d_set_d_op(dentry, &pid_dentry_operations);
> -	return d_splice_alias(inode, dentry);
> +	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
>  }
>  
>  static int proc_ns_dir_readdir(struct file *file, struct dir_context *ctx)
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index cc9d74a06ff0..7a8bffc03dc8 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -540,9 +540,8 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
>  			goto out;
>  	}
>  
> -	d_set_d_op(dentry, &proc_sys_dentry_operations);
>  	inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
> -	err = d_splice_alias(inode, dentry);
> +	err = d_splice_alias_ops(inode, dentry, &proc_sys_dentry_operations);
>  
>  out:
>  	if (h)
> @@ -699,9 +698,9 @@ static bool proc_sys_fill_cache(struct file *file,
>  			return false;
>  		if (d_in_lookup(child)) {
>  			struct dentry *res;
> -			d_set_d_op(child, &proc_sys_dentry_operations);
>  			inode = proc_sys_make_inode(dir->d_sb, head, table);
> -			res = d_splice_alias(inode, child);
> +			res = d_splice_alias_ops(inode, child,
> +						 &proc_sys_dentry_operations);
>  			d_lookup_done(child);
>  			if (unlikely(res)) {
>  				dput(child);
> -- 
> 2.39.5
>
diff mbox series

Patch

diff --git a/fs/proc/base.c b/fs/proc/base.c
index cd89e956c322..397a9f6f463e 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2709,8 +2709,7 @@  static struct dentry *proc_pident_instantiate(struct dentry *dentry,
 		inode->i_fop = p->fop;
 	ei->op = p->op;
 	pid_update_inode(task, inode);
-	d_set_d_op(dentry, &pid_dentry_operations);
-	return d_splice_alias(inode, dentry);
+	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
 }
 
 static struct dentry *proc_pident_lookup(struct inode *dir, 
@@ -3508,8 +3507,7 @@  static struct dentry *proc_pid_instantiate(struct dentry * dentry,
 	set_nlink(inode, nlink_tgid);
 	pid_update_inode(task, inode);
 
-	d_set_d_op(dentry, &pid_dentry_operations);
-	return d_splice_alias(inode, dentry);
+	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
 }
 
 struct dentry *proc_pid_lookup(struct dentry *dentry, unsigned int flags)
@@ -3813,8 +3811,7 @@  static struct dentry *proc_task_instantiate(struct dentry *dentry,
 	set_nlink(inode, nlink_tid);
 	pid_update_inode(task, inode);
 
-	d_set_d_op(dentry, &pid_dentry_operations);
-	return d_splice_alias(inode, dentry);
+	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
 }
 
 static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 499c2bf67488..774e18372914 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -255,10 +255,10 @@  struct dentry *proc_lookup_de(struct inode *dir, struct dentry *dentry,
 		if (!inode)
 			return ERR_PTR(-ENOMEM);
 		if (de->flags & PROC_ENTRY_FORCE_LOOKUP)
-			d_set_d_op(dentry, &proc_net_dentry_ops);
-		else
-			d_set_d_op(dentry, &proc_misc_dentry_ops);
-		return d_splice_alias(inode, dentry);
+			return d_splice_alias_ops(inode, dentry,
+						  &proc_net_dentry_ops);
+		return d_splice_alias_ops(inode, dentry,
+					  &proc_misc_dentry_ops);
 	}
 	read_unlock(&proc_subdir_lock);
 	return ERR_PTR(-ENOENT);
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 07f75c959173..48410381036b 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -358,7 +358,6 @@  static inline void pde_force_lookup(struct proc_dir_entry *pde)
 static inline struct dentry *proc_splice_unmountable(struct inode *inode,
 		struct dentry *dentry, const struct dentry_operations *d_ops)
 {
-	d_set_d_op(dentry, d_ops);
 	dont_mount(dentry);
-	return d_splice_alias(inode, dentry);
+	return d_splice_alias_ops(inode, dentry, d_ops);
 }
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index c610224faf10..4403a2e20c16 100644
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -111,8 +111,7 @@  static struct dentry *proc_ns_instantiate(struct dentry *dentry,
 	ei->ns_ops = ns_ops;
 	pid_update_inode(task, inode);
 
-	d_set_d_op(dentry, &pid_dentry_operations);
-	return d_splice_alias(inode, dentry);
+	return d_splice_alias_ops(inode, dentry, &pid_dentry_operations);
 }
 
 static int proc_ns_dir_readdir(struct file *file, struct dir_context *ctx)
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index cc9d74a06ff0..7a8bffc03dc8 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -540,9 +540,8 @@  static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
 			goto out;
 	}
 
-	d_set_d_op(dentry, &proc_sys_dentry_operations);
 	inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
-	err = d_splice_alias(inode, dentry);
+	err = d_splice_alias_ops(inode, dentry, &proc_sys_dentry_operations);
 
 out:
 	if (h)
@@ -699,9 +698,9 @@  static bool proc_sys_fill_cache(struct file *file,
 			return false;
 		if (d_in_lookup(child)) {
 			struct dentry *res;
-			d_set_d_op(child, &proc_sys_dentry_operations);
 			inode = proc_sys_make_inode(dir->d_sb, head, table);
-			res = d_splice_alias(inode, child);
+			res = d_splice_alias_ops(inode, child,
+						 &proc_sys_dentry_operations);
 			d_lookup_done(child);
 			if (unlikely(res)) {
 				dput(child);