korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 20:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

binfmt_misc: ->s_root is not going anywhere

Browse Source 
... no need to dget/dput it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-05-29 19:14:03 -04:00
parent 84c60b1388
commit ea7d4c046b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/binfmt_misc.c
View File

@ -637,13 +637,12 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer,
break; break;
case 3: case 3:
/* Delete this handler. */ /* Delete this handler. */
root = dget(file->f_path.dentry->d_sb->s_root); root = file_inode(file)->i_sb->s_root;
inode_lock(d_inode(root)); inode_lock(d_inode(root));
kill_node(e); kill_node(e);
inode_unlock(d_inode(root)); inode_unlock(d_inode(root));
dput(root);
break; break;
default: default:
return res; return res;
@ -665,8 +664,8 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
{ {
Node *e; Node *e;
struct inode *inode; struct inode *inode;
struct dentry *root, *dentry; struct super_block *sb = file_inode(file)->i_sb;
struct super_block *sb = file->f_path.dentry->d_sb; struct dentry *root = sb->s_root, *dentry;
int err = 0; int err = 0;
e = create_entry(buffer, count); e = create_entry(buffer, count);
@ -674,7 +673,6 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
if (IS_ERR(e)) if (IS_ERR(e))
return PTR_ERR(e); return PTR_ERR(e);
root = dget(sb->s_root);
inode_lock(d_inode(root)); inode_lock(d_inode(root));
dentry = lookup_one_len(e->name, root, strlen(e->name)); dentry = lookup_one_len(e->name, root, strlen(e->name));
err = PTR_ERR(dentry); err = PTR_ERR(dentry);
@ -712,7 +710,6 @@ out2:
dput(dentry); dput(dentry);
out: out:
inode_unlock(d_inode(root)); inode_unlock(d_inode(root));
dput(root);
if (err) { if (err) {
kfree(e); kfree(e);
@ -753,14 +750,13 @@ static ssize_t bm_status_write(struct file *file, const char __user *buffer,
break; break;
case 3: case 3:
/* Delete all handlers. */ /* Delete all handlers. */
root = dget(file->f_path.dentry->d_sb->s_root); root = file_inode(file)->i_sb->s_root;
inode_lock(d_inode(root)); inode_lock(d_inode(root));
while (!list_empty(&entries)) while (!list_empty(&entries))
kill_node(list_entry(entries.next, Node, list)); kill_node(list_entry(entries.next, Node, list));
inode_unlock(d_inode(root)); inode_unlock(d_inode(root));
dput(root);
break; break;
default: default:
return res; return res;