nfsd: pass net to nfsd_create_serv()

commit 6777436b0f072fb20a025a73e9b67a35ad8a5451 upstream.

Precursor patch. Hard-coded "init_net" will be replaced by proper one in
future.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
[wengmeiling: backport to 3.4: adjust context]
Signed-off-by: Weng Meiling <wengmeiling.weng@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index d014727fc8f2b877c873c5abef6855a6935dbb30..e18f0a5405ff03dd76be1b0862c7e71e4fc79cd4 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -657,7 +657,7 @@ static ssize_t __write_ports_addfd(char *buf)
        if (err != 0 || fd < 0)
                return -EINVAL;
 
-       err = nfsd_create_serv();
+       err = nfsd_create_serv(net);
        if (err != 0)
                return err;
 
@@ -708,7 +708,7 @@ static ssize_t __write_ports_addxprt(char *buf)
        if (port < 1 || port > USHRT_MAX)
                return -EINVAL;
 
-       err = nfsd_create_serv();
+       err = nfsd_create_serv(net);
        if (err != 0)
                return err;
 

diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 1336a6512cdc7c8bd3754b57d6d264b5479abece..356da43f778cd2509835f61d39e3a65a40054565 100644 (file)
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -101,7 +101,7 @@ enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
 int nfsd_vers(int vers, enum vers_op change);
 int nfsd_minorversion(u32 minorversion, enum vers_op change);
 void nfsd_reset_versions(void);
-int nfsd_create_serv(void);
+int nfsd_create_serv(struct net *net);
 
 extern int nfsd_max_blksize;
 

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index f8dae7575c1e16a3deb3874be97bb1d3342e7b6b..632d11e951582bd5e1d8c5ace2d9bcce1179c037 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -326,10 +326,9 @@ static int nfsd_get_default_max_blksize(void)
        return ret;
 }
 
-int nfsd_create_serv(void)
+int nfsd_create_serv(struct net *net)
 {
        int error;
-       struct net *net = &init_net;
 
        WARN_ON(!mutex_is_locked(&nfsd_mutex));
        if (nfsd_serv) {
@@ -451,7 +450,7 @@ nfsd_svc(unsigned short port, int nrservs)
        if (nrservs == 0 && nfsd_serv == NULL)
                goto out;
 
-       error = nfsd_create_serv();
+       error = nfsd_create_serv(net);
        if (error)
                goto out;