Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

nfsd: pass net to nfsd_set_nrthreads()

Browse source 
commit 3938a0d5eb 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>
This commit is contained in:
Stanislav Kinsbursky 2012-12-10 12:19:30 +03:00 committed by Greg Kroah-Hartman
parent b282713737
commit 044b2114e8
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

@ -440,6 +440,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();
@ -470,7 +471,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 *);
static inline void nfsd_destroy(struct net *net) static inline void nfsd_destroy(struct net *net)
{ {

3
fs/nfsd/nfssvc.c
View file

@ -374,12 +374,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));