switch open-coded instances of d_make_root() to new helper
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@ -486,8 +486,6 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
|
||||
|
||||
int proc_fill_super(struct super_block *s)
|
||||
{
|
||||
struct inode * root_inode;
|
||||
|
||||
s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;
|
||||
s->s_blocksize = 1024;
|
||||
s->s_blocksize_bits = 10;
|
||||
@ -496,17 +494,10 @@ int proc_fill_super(struct super_block *s)
|
||||
s->s_time_gran = 1;
|
||||
|
||||
pde_get(&proc_root);
|
||||
root_inode = proc_get_inode(s, &proc_root);
|
||||
if (!root_inode)
|
||||
goto out_no_root;
|
||||
s->s_root = d_alloc_root(root_inode);
|
||||
if (!s->s_root) {
|
||||
iput(root_inode);
|
||||
goto out_no_root;
|
||||
}
|
||||
return 0;
|
||||
s->s_root = d_make_root(proc_get_inode(s, &proc_root));
|
||||
if (s->s_root)
|
||||
return 0;
|
||||
|
||||
out_no_root:
|
||||
printk("proc_read_super: get root inode failed\n");
|
||||
pde_put(&proc_root);
|
||||
return -ENOMEM;
|
||||
|
Reference in New Issue
Block a user