dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

nfsd: pass net to nfsd_svc() 

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:25 +03:00 committed by J. Bruce Fields
parent 6777436b0f
commit d41a9417cd
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfsctl.c
View File

@ -396,6 +396,8 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)
{
char *mesg = buf;
int rv;
struct net *net = &init_net;
if (size > 0) {
int newthreads;
rv = get_int(&mesg, &newthreads);
@ -403,7 +405,7 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size)
return rv;
if (newthreads < 0)
return -EINVAL;
rv = nfsd_svc(newthreads);
rv = nfsd_svc(newthreads, net);
if (rv < 0)
return rv;
} else

2
fs/nfsd/nfsd.h
View File

@ -65,7 +65,7 @@ extern const struct seq_operations nfs_exports_op;
/*
* Function prototypes.
*/
int nfsd_svc(int nrservs);
int nfsd_svc(int nrservs, struct net *net);
int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp);
int nfsd_nrthreads(void);

3
fs/nfsd/nfssvc.c
View File

@ -442,11 +442,10 @@ int nfsd_set_nrthreads(int n, int *nthreads)
* this is the first time nrservs is nonzero.
*/
int
nfsd_svc(int nrservs)
nfsd_svc(int nrservs, struct net *net)
{
int error;
bool nfsd_up_before;
struct net *net = &init_net;
mutex_lock(&nfsd_mutex);
dprintk("nfsd: creating service\n");