switch the rest of procfs lookups to d_splice_alias()

Signed-off-by: Al Viro <[email protected]>

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 2078e70e1595f1d29d6901848f439a05fe2a929c..b77034a694ef4c267b336da31857c1a7e12916fb 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -256,8 +256,7 @@ struct dentry *proc_lookup_de(struct inode *dir, struct dentry *dentry,
                if (!inode)
                        return ERR_PTR(-ENOMEM);
                d_set_d_op(dentry, &proc_misc_dentry_ops);
-               d_add(dentry, inode);
-               return NULL;
+               return d_splice_alias(inode, dentry);
        }
        read_unlock(&proc_subdir_lock);
        return ERR_PTR(-ENOENT);

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 8989936f29959a62a12e4b1c1e2d866f940a93a0..4d765e5e91eda8961d3a49fab214dd8736c1e699 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -554,9 +554,8 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
        if (!inode)
                goto out;
 
-       err = NULL;
        d_set_d_op(dentry, &proc_sys_dentry_operations);
-       d_add(dentry, inode);
+       err = d_splice_alias(inode, dentry);
 
 out:
        if (h)
@@ -684,6 +683,7 @@ static bool proc_sys_fill_cache(struct file *file,
                if (IS_ERR(child))
                        return false;
                if (d_in_lookup(child)) {
+                       struct dentry *res;
                        inode = proc_sys_make_inode(dir->d_sb, head, table);
                        if (!inode) {
                                d_lookup_done(child);
@@ -691,7 +691,16 @@ static bool proc_sys_fill_cache(struct file *file,
                                return false;
                        }
                        d_set_d_op(child, &proc_sys_dentry_operations);
-                       d_add(child, inode);
+                       res = d_splice_alias(inode, child);
+                       d_lookup_done(child);
+                       if (unlikely(res)) {
+                               if (IS_ERR(res)) {
+                                       dput(child);
+                                       return false;
+                               }
+                               dput(child);
+                               child = res;
+                       }
                }
        }
        inode = d_inode(child);