Commit 289f00e2 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Al Viro

Remove get_init_pts_sb()

With mknod_ptmx() moved to devpts_get_sb(), init_pts_mount() becomes
a wrapper around get_init_pts_sb(). Remove get_init_pts_sb() and
fold code into init_pts_mount().
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 945cf2c7
...@@ -342,7 +342,11 @@ static int new_pts_mount(struct file_system_type *fs_type, int flags, ...@@ -342,7 +342,11 @@ static int new_pts_mount(struct file_system_type *fs_type, int flags,
} }
/* /*
* get_init_pts_sb() * init_pts_mount()
*
* Mount or remount the initial kernel mount of devpts. This type of
* mount maintains the legacy, single-instance semantics, while the
* kernel still allows multiple-instances.
* *
* This interface is needed to support multiple namespace semantics in * This interface is needed to support multiple namespace semantics in
* devpts while preserving backward compatibility of the current 'single- * devpts while preserving backward compatibility of the current 'single-
...@@ -362,7 +366,7 @@ static int new_pts_mount(struct file_system_type *fs_type, int flags, ...@@ -362,7 +366,7 @@ static int new_pts_mount(struct file_system_type *fs_type, int flags,
* consistently selects the 'single-namespace' superblock even in the * consistently selects the 'single-namespace' superblock even in the
* presence of the private namespace (i.e 'newinstance') super-blocks. * presence of the private namespace (i.e 'newinstance') super-blocks.
*/ */
static int get_init_pts_sb(struct file_system_type *fs_type, int flags, static int init_pts_mount(struct file_system_type *fs_type, int flags,
void *data, struct pts_mount_opts *opts, struct vfsmount *mnt) void *data, struct pts_mount_opts *opts, struct vfsmount *mnt)
{ {
struct super_block *s; struct super_block *s;
...@@ -392,23 +396,6 @@ static int get_init_pts_sb(struct file_system_type *fs_type, int flags, ...@@ -392,23 +396,6 @@ static int get_init_pts_sb(struct file_system_type *fs_type, int flags,
return 0; return 0;
} }
/*
* Mount or remount the initial kernel mount of devpts. This type of
* mount maintains the legacy, single-instance semantics, while the
* kernel still allows multiple-instances.
*/
static int init_pts_mount(struct file_system_type *fs_type, int flags,
void *data, struct pts_mount_opts *opts, struct vfsmount *mnt)
{
int err;
err = get_init_pts_sb(fs_type, flags, data, opts, mnt);
if (err)
return err;
return err;
}
static int devpts_get_sb(struct file_system_type *fs_type, static int devpts_get_sb(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data, struct vfsmount *mnt) int flags, const char *dev_name, void *data, struct vfsmount *mnt)
{ {
......
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