Commit c1b241f0 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman

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: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 180d9044
...@@ -451,24 +451,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent) ...@@ -451,24 +451,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
static struct dentry *devpts_mount(struct file_system_type *fs_type, static struct dentry *devpts_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data) int flags, const char *dev_name, void *data)
{ {
int error; return mount_nodev(fs_type, flags, data, devpts_fill_super);
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);
} }
static void devpts_kill_sb(struct super_block *sb) static void devpts_kill_sb(struct super_block *sb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment