leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd: pass net to nfsd_set_nrthreads()

Browse Source 
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>
This commit is contained in:
Stanislav Kinsbursky 2012-12-10 12:19:30 +03:00 committed by J. Bruce Fields
parent d41a9417cd
commit 3938a0d5eb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfsd/nfsctl.c
View File

@ -447,6 +447,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size)
int len; int len;
int npools; int npools;
int *nthreads; int *nthreads;
struct net *net = &init_net;
mutex_lock(&nfsd_mutex); mutex_lock(&nfsd_mutex);
npools = nfsd_nrpools(); 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) if (nthreads[i] < 0)
goto out_free; goto out_free;
} }
rv = nfsd_set_nrthreads(i, nthreads); rv = nfsd_set_nrthreads(i, nthreads, net);
if (rv) if (rv)
goto out_free; goto out_free;
} }

2
fs/nfsd/nfsd.h
View File

@ -71,7 +71,7 @@ int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp);
int nfsd_nrthreads(void); int nfsd_nrthreads(void);
int nfsd_nrpools(void); int nfsd_nrpools(void);
int nfsd_get_nrthreads(int n, int *); 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_open(struct inode *, struct file *);
int nfsd_pool_stats_release(struct inode *, struct file *); int nfsd_pool_stats_release(struct inode *, struct file *);

3
fs/nfsd/nfssvc.c
View File

@ -382,12 +382,11 @@ int nfsd_get_nrthreads(int n, int *nthreads)
return 0; 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 i = 0;
int tot = 0; int tot = 0;
int err = 0; int err = 0;
struct net *net = &init_net;
WARN_ON(!mutex_is_locked(&nfsd_mutex)); WARN_ON(!mutex_is_locked(&nfsd_mutex));