Unroll essentials of do_remount_sb() into devpts

[pandora-kernel.git] / fs / devpts / inode.c

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index b0a7634..fb4da9d 100644 (file)
--- 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;
 }