diff options
-rw-r--r-- | fs/devpts/inode.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index b793e6e3c21e..00530e82673e 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c | |||
@@ -72,11 +72,9 @@ static inline struct super_block *pts_sb_from_inode(struct inode *inode) | |||
72 | return devpts_mnt->mnt_sb; | 72 | return devpts_mnt->mnt_sb; |
73 | } | 73 | } |
74 | 74 | ||
75 | static int devpts_remount(struct super_block *sb, int *flags, char *data) | 75 | static int parse_mount_options(char *data, struct pts_mount_opts *opts) |
76 | { | 76 | { |
77 | char *p; | 77 | char *p; |
78 | struct pts_fs_info *fsi = DEVPTS_SB(sb); | ||
79 | struct pts_mount_opts *opts = &fsi->mount_opts; | ||
80 | 78 | ||
81 | opts->setuid = 0; | 79 | opts->setuid = 0; |
82 | opts->setgid = 0; | 80 | opts->setgid = 0; |
@@ -120,6 +118,14 @@ static int devpts_remount(struct super_block *sb, int *flags, char *data) | |||
120 | return 0; | 118 | return 0; |
121 | } | 119 | } |
122 | 120 | ||
121 | static int devpts_remount(struct super_block *sb, int *flags, char *data) | ||
122 | { | ||
123 | struct pts_fs_info *fsi = DEVPTS_SB(sb); | ||
124 | struct pts_mount_opts *opts = &fsi->mount_opts; | ||
125 | |||
126 | return parse_mount_options(data, opts); | ||
127 | } | ||
128 | |||
123 | static int devpts_show_options(struct seq_file *seq, struct vfsmount *vfs) | 129 | static int devpts_show_options(struct seq_file *seq, struct vfsmount *vfs) |
124 | { | 130 | { |
125 | struct pts_fs_info *fsi = DEVPTS_SB(vfs->mnt_sb); | 131 | struct pts_fs_info *fsi = DEVPTS_SB(vfs->mnt_sb); |