leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch the rest of procfs lookups to d_splice_alias()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-05-03 09:45:06 -04:00
parent 0168b9e38c
commit 888e2b03ef
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/proc/generic.c
View File

@ -256,8 +256,7 @@ struct dentry *proc_lookup_de(struct inode *dir, struct dentry *dentry,
if (!inode) if (!inode)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
d_set_d_op(dentry, &proc_misc_dentry_ops); d_set_d_op(dentry, &proc_misc_dentry_ops);
d_add(dentry, inode); return d_splice_alias(inode, dentry);
return NULL;
} }
read_unlock(&proc_subdir_lock); read_unlock(&proc_subdir_lock);
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);

15
fs/proc/proc_sysctl.c
View File

@ -554,9 +554,8 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
if (!inode) if (!inode)
goto out; goto out;
err = NULL;
d_set_d_op(dentry, &proc_sys_dentry_operations); d_set_d_op(dentry, &proc_sys_dentry_operations);
d_add(dentry, inode); err = d_splice_alias(inode, dentry);
out: out:
if (h) if (h)
@ -684,6 +683,7 @@ static bool proc_sys_fill_cache(struct file *file,
if (IS_ERR(child)) if (IS_ERR(child))
return false; return false;
if (d_in_lookup(child)) { if (d_in_lookup(child)) {
struct dentry *res;
inode = proc_sys_make_inode(dir->d_sb, head, table); inode = proc_sys_make_inode(dir->d_sb, head, table);
if (!inode) { if (!inode) {
d_lookup_done(child); d_lookup_done(child);
@ -691,7 +691,16 @@ static bool proc_sys_fill_cache(struct file *file,
return false; return false;
} }
d_set_d_op(child, &proc_sys_dentry_operations); 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); inode = d_inode(child);