From e21eb272d562b1310842d7f111b01c3e7523244b Mon Sep 17 00:00:00 2001
From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Date: Fri, 2 Jan 2009 13:41:47 +0000
Subject: [PATCH] --- yaml --- r: 125029 b: refs/heads/master c:
 53af8ee4094d80ddaac7efefb572b1c22ae49367 h: refs/heads/master i:   125027:
 15f7039f169452fce9c37531cb090480453ff279 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/devpts/inode.c | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 188bb953c596..c2d2ca2d0073 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31af0abbdafb66ad8e27e3df878faec2ebe1132e
+refs/heads/master: 53af8ee4094d80ddaac7efefb572b1c22ae49367
diff --git a/trunk/fs/devpts/inode.c b/trunk/fs/devpts/inode.c
index b793e6e3c21e..00530e82673e 100644
--- a/trunk/fs/devpts/inode.c
+++ b/trunk/fs/devpts/inode.c
@@ -72,11 +72,9 @@ static inline struct super_block *pts_sb_from_inode(struct inode *inode)
 	return devpts_mnt->mnt_sb;
 }
 
-static int devpts_remount(struct super_block *sb, int *flags, char *data)
+static int parse_mount_options(char *data, struct pts_mount_opts *opts)
 {
 	char *p;
-	struct pts_fs_info *fsi = DEVPTS_SB(sb);
-	struct pts_mount_opts *opts = &fsi->mount_opts;
 
 	opts->setuid  = 0;
 	opts->setgid  = 0;
@@ -120,6 +118,14 @@ static int devpts_remount(struct super_block *sb, int *flags, char *data)
 	return 0;
 }
 
+static int devpts_remount(struct super_block *sb, int *flags, char *data)
+{
+	struct pts_fs_info *fsi = DEVPTS_SB(sb);
+	struct pts_mount_opts *opts = &fsi->mount_opts;
+
+	return parse_mount_options(data, opts);
+}
+
 static int devpts_show_options(struct seq_file *seq, struct vfsmount *vfs)
 {
 	struct pts_fs_info *fsi = DEVPTS_SB(vfs->mnt_sb);