aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorStanislav Kinsbursky2012-12-10 03:19:20 -0600
committerJ. Bruce Fields2012-12-10 15:25:34 -0600
commit6777436b0f072fb20a025a73e9b67a35ad8a5451 (patch)
tree9d241fd4d995b0743752376ae5ebcf3757e6fd70 /fs/nfsd
parentdb42d1a76a8dfcaba7a2dc9c591fa4e231db22b3 (diff)
downloadkernel-omap-6777436b0f072fb20a025a73e9b67a35ad8a5451.tar.gz
kernel-omap-6777436b0f072fb20a025a73e9b67a35ad8a5451.tar.xz
kernel-omap-6777436b0f072fb20a025a73e9b67a35ad8a5451.zip
nfsd: pass net to nfsd_create_serv()
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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfsctl.c4
-rw-r--r--fs/nfsd/nfsd.h2
-rw-r--r--fs/nfsd/nfssvc.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index e13cbddcdbd0..ae1d14313ef8 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -664,7 +664,7 @@ static ssize_t __write_ports_addfd(char *buf)
664 if (err != 0 || fd < 0) 664 if (err != 0 || fd < 0)
665 return -EINVAL; 665 return -EINVAL;
666 666
667 err = nfsd_create_serv(); 667 err = nfsd_create_serv(net);
668 if (err != 0) 668 if (err != 0)
669 return err; 669 return err;
670 670
@@ -696,7 +696,7 @@ static ssize_t __write_ports_addxprt(char *buf)
696 if (port < 1 || port > USHRT_MAX) 696 if (port < 1 || port > USHRT_MAX)
697 return -EINVAL; 697 return -EINVAL;
698 698
699 err = nfsd_create_serv(); 699 err = nfsd_create_serv(net);
700 if (err != 0) 700 if (err != 0)
701 return err; 701 return err;
702 702
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 5eea0f5021fd..acddf71abd51 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -103,7 +103,7 @@ enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL };
103int nfsd_vers(int vers, enum vers_op change); 103int nfsd_vers(int vers, enum vers_op change);
104int nfsd_minorversion(u32 minorversion, enum vers_op change); 104int nfsd_minorversion(u32 minorversion, enum vers_op change);
105void nfsd_reset_versions(void); 105void nfsd_reset_versions(void);
106int nfsd_create_serv(void); 106int nfsd_create_serv(struct net *net);
107 107
108extern int nfsd_max_blksize; 108extern int nfsd_max_blksize;
109 109
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 21cba3d7c865..6448391cde54 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -334,10 +334,9 @@ static int nfsd_get_default_max_blksize(void)
334 return ret; 334 return ret;
335} 335}
336 336
337int nfsd_create_serv(void) 337int nfsd_create_serv(struct net *net)
338{ 338{
339 int error; 339 int error;
340 struct net *net = &init_net;
341 340
342 WARN_ON(!mutex_is_locked(&nfsd_mutex)); 341 WARN_ON(!mutex_is_locked(&nfsd_mutex));
343 if (nfsd_serv) { 342 if (nfsd_serv) {
@@ -459,7 +458,7 @@ nfsd_svc(int nrservs)
459 if (nrservs == 0 && nfsd_serv == NULL) 458 if (nrservs == 0 && nfsd_serv == NULL)
460 goto out; 459 goto out;
461 460
462 error = nfsd_create_serv(); 461 error = nfsd_create_serv(net);
463 if (error) 462 if (error)
464 goto out; 463 goto out;
465 464