mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 04:42:12 +00:00
devpts: Simplify devpts_mount by using mount_nodev
Now that all of the work of setting up a superblock has been moved to devpts_fill_super simplify devpts_mount by calling mount_nodev instead of rolling mount_nodev by hand. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
180d904442
commit
c1b241f0c1
@ -451,24 +451,7 @@ fail:
|
||||
static struct dentry *devpts_mount(struct file_system_type *fs_type,
|
||||
int flags, const char *dev_name, void *data)
|
||||
{
|
||||
int error;
|
||||
struct super_block *s;
|
||||
|
||||
s = sget(fs_type, NULL, set_anon_super, flags, NULL);
|
||||
if (IS_ERR(s))
|
||||
return ERR_CAST(s);
|
||||
|
||||
if (!s->s_root) {
|
||||
error = devpts_fill_super(s, data, flags & MS_SILENT ? 1 : 0);
|
||||
if (error)
|
||||
goto out_undo_sget;
|
||||
s->s_flags |= MS_ACTIVE;
|
||||
}
|
||||
return dget(s->s_root);
|
||||
|
||||
out_undo_sget:
|
||||
deactivate_locked_super(s);
|
||||
return ERR_PTR(error);
|
||||
return mount_nodev(fs_type, flags, data, devpts_fill_super);
|
||||
}
|
||||
|
||||
static void devpts_kill_sb(struct super_block *sb)
|
||||
|
Loading…
Reference in New Issue
Block a user