openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

devpts: Move the creation of /dev/pts/ptmx into fill_super 

The code makes more sense here and things are just clearer.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2016-04-19 17:51:04 -05:00
parent 208904793a
commit 7dd17f7134
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/devpts/inode.c
View File

@ -425,11 +425,19 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
set_nlink(inode, 2); set_nlink(inode, 2);
s->s_root = d_make_root(inode); s->s_root = d_make_root(inode);
if (s->s_root) if (!s->s_root) {
return 0; pr_err("get root dentry failed\n");
goto fail;
}
pr_err("get root dentry failed\n"); error = mknod_ptmx(s);
if (error)
goto fail_dput;
return 0;
fail_dput:
dput(s->s_root);
s->s_root = NULL;
fail: fail:
return error; return error;
} }
@ -456,11 +464,6 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type,
goto out_undo_sget; goto out_undo_sget;
s->s_flags |= MS_ACTIVE; s->s_flags |= MS_ACTIVE;
} }
error = mknod_ptmx(s);
if (error)
goto out_undo_sget;
return dget(s->s_root); return dget(s->s_root);
out_undo_sget: out_undo_sget: