diff options
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 3 | ||||
| -rw-r--r-- | fs/nfsd/nfsd.h | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfssvc.c | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 68e229cdfd63..58f0ae44779d 100644 --- 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) | |||
| 447 | int len; | 447 | int len; |
| 448 | int npools; | 448 | int npools; |
| 449 | int *nthreads; | 449 | int *nthreads; |
| 450 | struct net *net = &init_net; | ||
| 450 | 451 | ||
| 451 | mutex_lock(&nfsd_mutex); | 452 | mutex_lock(&nfsd_mutex); |
| 452 | npools = nfsd_nrpools(); | 453 | npools = nfsd_nrpools(); |
| @@ -477,7 +478,7 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size) | |||
| 477 | if (nthreads[i] < 0) | 478 | if (nthreads[i] < 0) |
| 478 | goto out_free; | 479 | goto out_free; |
| 479 | } | 480 | } |
| 480 | rv = nfsd_set_nrthreads(i, nthreads); | 481 | rv = nfsd_set_nrthreads(i, nthreads, net); |
| 481 | if (rv) | 482 | if (rv) |
| 482 | goto out_free; | 483 | goto out_free; |
| 483 | } | 484 | } |
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 8226c1b02558..18f999665546 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h | |||
| @@ -71,7 +71,7 @@ int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp); | |||
| 71 | int nfsd_nrthreads(void); | 71 | int nfsd_nrthreads(void); |
| 72 | int nfsd_nrpools(void); | 72 | int nfsd_nrpools(void); |
| 73 | int nfsd_get_nrthreads(int n, int *); | 73 | int nfsd_get_nrthreads(int n, int *); |
| 74 | int nfsd_set_nrthreads(int n, int *); | 74 | int nfsd_set_nrthreads(int n, int *, struct net *); |
| 75 | int nfsd_pool_stats_open(struct inode *, struct file *); | 75 | int nfsd_pool_stats_open(struct inode *, struct file *); |
| 76 | int nfsd_pool_stats_release(struct inode *, struct file *); | 76 | int nfsd_pool_stats_release(struct inode *, struct file *); |
| 77 | 77 | ||
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index f199b537cc81..b144658c49b2 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
| @@ -382,12 +382,11 @@ int nfsd_get_nrthreads(int n, int *nthreads) | |||
| 382 | return 0; | 382 | return 0; |
| 383 | } | 383 | } |
| 384 | 384 | ||
| 385 | int nfsd_set_nrthreads(int n, int *nthreads) | 385 | int nfsd_set_nrthreads(int n, int *nthreads, struct net *net) |
| 386 | { | 386 | { |
| 387 | int i = 0; | 387 | int i = 0; |
| 388 | int tot = 0; | 388 | int tot = 0; |
| 389 | int err = 0; | 389 | int err = 0; |
| 390 | struct net *net = &init_net; | ||
| 391 | 390 | ||
| 392 | WARN_ON(!mutex_is_locked(&nfsd_mutex)); | 391 | WARN_ON(!mutex_is_locked(&nfsd_mutex)); |
| 393 | 392 | ||
