Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 979c1e309c73..14afbabe6546 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -439,15 +439,15 @@ static struct dentry *devpts_mount(struct file_system_type *fs_type,
                 return ERR_PTR(error);
 
         if (opts.newinstance)
-                s = sget(fs_type, NULL, set_anon_super, NULL);
+                s = sget(fs_type, NULL, set_anon_super, flags, NULL);
         else
-                s = sget(fs_type, compare_init_pts_sb, set_anon_super, NULL);
+                s = sget(fs_type, compare_init_pts_sb, set_anon_super, flags,
+                         NULL);
 
         if (IS_ERR(s))
                 return ERR_CAST(s);
 
         if (!s->s_root) {
-                s->s_flags = flags;
                 error = devpts_fill_super(s, data, flags & MS_SILENT ? 1 : 0);
                 if (error)
                         goto out_undo_sget;