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

nfsd: pass net to nfsd_create_serv()

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

4
fs/nfsd/nfsctl.c
View File

@ -664,7 +664,7 @@ static ssize_t __write_ports_addfd(char *buf)
if (err != 0 || fd < 0) if (err != 0 || fd < 0)
return -EINVAL; return -EINVAL;
err = nfsd_create_serv(); err = nfsd_create_serv(net);
if (err != 0) if (err != 0)
return err; return err;
@ -696,7 +696,7 @@ static ssize_t __write_ports_addxprt(char *buf)
if (port < 1 || port > USHRT_MAX) if (port < 1 || port > USHRT_MAX)
return -EINVAL; return -EINVAL;
err = nfsd_create_serv(); err = nfsd_create_serv(net);
if (err != 0) if (err != 0)
return err; return err;

2
fs/nfsd/nfsd.h
View File

@ -103,7 +103,7 @@ enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
int nfsd_vers(int vers, enum vers_op change); int nfsd_vers(int vers, enum vers_op change);
int nfsd_minorversion(u32 minorversion, enum vers_op change); int nfsd_minorversion(u32 minorversion, enum vers_op change);
void nfsd_reset_versions(void); void nfsd_reset_versions(void);
int nfsd_create_serv(void); int nfsd_create_serv(struct net *net);
extern int nfsd_max_blksize; extern int nfsd_max_blksize;

5
fs/nfsd/nfssvc.c
View File

@ -334,10 +334,9 @@ static int nfsd_get_default_max_blksize(void)
return ret; return ret;
} }
int nfsd_create_serv(void) int nfsd_create_serv(struct net *net)
{ {
int error; int error;
struct net *net = &init_net;
WARN_ON(!mutex_is_locked(&nfsd_mutex)); WARN_ON(!mutex_is_locked(&nfsd_mutex));
if (nfsd_serv) { if (nfsd_serv) {
@ -459,7 +458,7 @@ nfsd_svc(int nrservs)
if (nrservs == 0 && nfsd_serv == NULL) if (nrservs == 0 && nfsd_serv == NULL)
goto out; goto out;
error = nfsd_create_serv(); error = nfsd_create_serv(net);
if (error) if (error)
goto out; goto out;