nfsd: pass net to nfsd_set_nrthreads()

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>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 68e229cdfd63cb66d3f1b1910ae69a975d195535..58f0ae44779d8a39b9770ce370167f068fca2667 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -447,6 +447,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
        int len;
        int npools;
        int *nthreads;
+       struct net *net = &init_net;
 
        mutex_lock(&nfsd_mutex);
        npools = nfsd_nrpools();
@@ -477,7 +478,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
                        if (nthreads[i] < 0)
                                goto out_free;
                }
-               rv = nfsd_set_nrthreads(i, nthreads);
+               rv = nfsd_set_nrthreads(i, nthreads, net);
                if (rv)
                        goto out_free;
        }

diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 8226c1b0255845ed69f5b56e2f4e59ff63660795..18f9996655460ce97154f4fbf665ac523a34ee4b 100644 (file)
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -71,7 +71,7 @@ int           nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp);
 int            nfsd_nrthreads(void);
 int            nfsd_nrpools(void);
 int            nfsd_get_nrthreads(int n, int *);
-int            nfsd_set_nrthreads(int n, int *);
+int            nfsd_set_nrthreads(int n, int *, struct net *);
 int            nfsd_pool_stats_open(struct inode *, struct file *);
 int            nfsd_pool_stats_release(struct inode *, struct file *);
 

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index f199b537cc8175b636b5742ae637c173ad7fce60..b144658c49b22390066fd98c4c41e3a656bca85f 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -382,12 +382,11 @@ int nfsd_get_nrthreads(int n, int *nthreads)
        return 0;
 }
 
-int nfsd_set_nrthreads(int n, int *nthreads)
+int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
 {
        int i = 0;
        int tot = 0;
        int err = 0;
-       struct net *net = &init_net;
 
        WARN_ON(!mutex_is_locked(&nfsd_mutex));