aboutsummaryrefslogtreecommitdiffstats
path: root/fs/devpts
diff options
context:
space:
mode:
authorSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>2009-03-07 13:16:20 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2009-03-27 14:44:03 -0400
commitfdbf5348661ac9d519164d1489f30cc0384fda58 (patch)
tree54c944d78f28a2700aa3424322d7d758fbbde25c /fs/devpts
parenta3ec947c85ec339884b30ef6a08133e9311fdae1 (diff)
Unroll essentials of do_remount_sb() into devpts
On remount, devpts fs only needs to parse the mount options. Users cannot directly create/dirty files in /dev/pts so the MS_RDONLY flag and shrinking the dcache does not really apply to devpts. So effectively on remount, devpts only parses the mount options and updates these options in its super block. As such, we could replace do_remount_sb() call with a direct parse_mount_options(). Doing so enables subsequent patches to avoid parsing the mount options twice and simplify the code. Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/devpts')
-rw-r--r--fs/devpts/inode.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index b0a76340a4cd..fb4da9d89130 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -437,6 +437,8 @@ static int get_init_pts_sb(struct file_system_type *fs_type, int flags,
437 void *data, struct vfsmount *mnt) 437 void *data, struct vfsmount *mnt)
438{ 438{
439 struct super_block *s; 439 struct super_block *s;
440 struct pts_mount_opts *opts;
441 struct pts_fs_info *fsi;
440 int error; 442 int error;
441 443
442 s = sget(fs_type, compare_init_pts_sb, set_anon_super, NULL); 444 s = sget(fs_type, compare_init_pts_sb, set_anon_super, NULL);
@@ -453,7 +455,10 @@ static int get_init_pts_sb(struct file_system_type *fs_type, int flags,
453 } 455 }
454 s->s_flags |= MS_ACTIVE; 456 s->s_flags |= MS_ACTIVE;
455 } 457 }
456 do_remount_sb(s, flags, data, 0); 458 fsi = DEVPTS_SB(s);
459 opts = &fsi->mount_opts;
460 parse_mount_options(data, PARSE_REMOUNT, opts);
461
457 simple_set_mnt(mnt, s); 462 simple_set_mnt(mnt, s);
458 return 0; 463 return 0;
459} 464}