1 files changed, 4 insertions, 9 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index e7787777620e..65ad0165a94f 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1151,20 +1151,15 @@ static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
 #endif
                 /* last one */ {""}
         };
-        struct net *net = data;
-        int ret;
-
-        ret = simple_fill_super(sb, 0x6e667364, nfsd_files);
-        if (ret)
-                return ret;
-        sb->s_fs_info = get_net(net);
-        return 0;
+        get_net(sb->s_fs_info);
+        return simple_fill_super(sb, 0x6e667364, nfsd_files);
 }
 
 static struct dentry *nfsd_mount(struct file_system_type *fs_type,
         int flags, const char *dev_name, void *data)
 {
-        return mount_ns(fs_type, flags, current->nsproxy->net_ns, nfsd_fill_super);
+        struct net *net = current->nsproxy->net_ns;
+        return mount_ns(fs_type, flags, data, net, net->user_ns, nfsd_fill_super);
 }
 
 static void nfsd_umount(struct super_block *sb)