Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/libfs.c b/fs/libfs.c
index f86ec27a4230..a74cb1725ac6 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -53,7 +53,7 @@ static int simple_delete_dentry(const struct dentry *dentry)
  * Lookup the data. This is trivial - if the dentry didn't already
  * exist, we know it is negative.  Set d_op to delete negative dentries.
  */
-struct dentry *simple_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
+struct dentry *simple_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
 {
         static const struct dentry_operations simple_dentry_operations = {
                 .d_delete = simple_delete_dentry,
@@ -222,15 +222,15 @@ struct dentry *mount_pseudo(struct file_system_type *fs_type, char *name,
         const struct super_operations *ops,
         const struct dentry_operations *dops, unsigned long magic)
 {
-        struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);
+        struct super_block *s;
         struct dentry *dentry;
         struct inode *root;
         struct qstr d_name = QSTR_INIT(name, strlen(name));
 
+        s = sget(fs_type, NULL, set_anon_super, MS_NOUSER, NULL);
         if (IS_ERR(s))
                 return ERR_CAST(s);
 
-        s->s_flags = MS_NOUSER;
         s->s_maxbytes = MAX_LFS_FILESIZE;
         s->s_blocksize = PAGE_SIZE;
         s->s_blocksize_bits = PAGE_SHIFT;