aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>2009-03-07 10:16:20 -0800
committerAl Viro <viro@zeniv.linux.org.uk>2009-03-27 14:44:03 -0400
commitfdbf5348661ac9d519164d1489f30cc0384fda58 (patch)
tree54c944d78f28a2700aa3424322d7d758fbbde25c /fs
parenta3ec947c85ec339884b30ef6a08133e9311fdae1 (diff)
downloadmrst-s0i3-test-fdbf5348661ac9d519164d1489f30cc0384fda58.tar.gz
mrst-s0i3-test-fdbf5348661ac9d519164d1489f30cc0384fda58.tar.xz
mrst-s0i3-test-fdbf5348661ac9d519164d1489f30cc0384fda58.zip
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')
-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 b0a76340a4c..fb4da9d8913 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,
void *data, struct vfsmount *mnt)
{
struct super_block *s;
+ struct pts_mount_opts *opts;
+ struct pts_fs_info *fsi;
int error;
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,
}
s->s_flags |= MS_ACTIVE;
}
- do_remount_sb(s, flags, data, 0);
+ fsi = DEVPTS_SB(s);
+ opts = &fsi->mount_opts;
+ parse_mount_options(data, PARSE_REMOUNT, opts);
+
simple_set_mnt(mnt, s);
return 0;
}