---

yaml --- r: 135952 b: refs/heads/master c: fdbf534 h: refs/heads/master v: v3
git-mirror · Mar 27, 2009 · 95014b3 · 95014b3
1 parent 5051326
commit 95014b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3ec947c85ec339884b30ef6a08133e9311fdae1
+refs/heads/master: fdbf5348661ac9d519164d1489f30cc0384fda58
diff --git a/trunk/fs/devpts/inode.c b/trunk/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;
 }