diff options
author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-12-10 04:19:09 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-12-10 16:25:32 -0500 |
commit | db6e182c17cb1a7069f7f8924721ce58ac05d9a3 (patch) | |
tree | 0af2684d7ba1f9569ae1468e5b6b89cf7868a3cf /fs | |
parent | f7fb86c6e639360ad9c253cec534819ef928a674 (diff) |
nfsd: pass net to nfsd_init_socks()
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')
-rw-r--r-- | fs/nfsd/nfssvc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 9beace6a868c..9fd8496d5b84 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -182,18 +182,18 @@ int nfsd_nrthreads(void) | |||
182 | return rv; | 182 | return rv; |
183 | } | 183 | } |
184 | 184 | ||
185 | static int nfsd_init_socks(void) | 185 | static int nfsd_init_socks(struct net *net) |
186 | { | 186 | { |
187 | int error; | 187 | int error; |
188 | if (!list_empty(&nfsd_serv->sv_permsocks)) | 188 | if (!list_empty(&nfsd_serv->sv_permsocks)) |
189 | return 0; | 189 | return 0; |
190 | 190 | ||
191 | error = svc_create_xprt(nfsd_serv, "udp", &init_net, PF_INET, NFS_PORT, | 191 | error = svc_create_xprt(nfsd_serv, "udp", net, PF_INET, NFS_PORT, |
192 | SVC_SOCK_DEFAULTS); | 192 | SVC_SOCK_DEFAULTS); |
193 | if (error < 0) | 193 | if (error < 0) |
194 | return error; | 194 | return error; |
195 | 195 | ||
196 | error = svc_create_xprt(nfsd_serv, "tcp", &init_net, PF_INET, NFS_PORT, | 196 | error = svc_create_xprt(nfsd_serv, "tcp", net, PF_INET, NFS_PORT, |
197 | SVC_SOCK_DEFAULTS); | 197 | SVC_SOCK_DEFAULTS); |
198 | if (error < 0) | 198 | if (error < 0) |
199 | return error; | 199 | return error; |
@@ -218,7 +218,7 @@ static int nfsd_startup(int nrservs) | |||
218 | ret = nfsd_racache_init(2*nrservs); | 218 | ret = nfsd_racache_init(2*nrservs); |
219 | if (ret) | 219 | if (ret) |
220 | return ret; | 220 | return ret; |
221 | ret = nfsd_init_socks(); | 221 | ret = nfsd_init_socks(net); |
222 | if (ret) | 222 | if (ret) |
223 | goto out_racache; | 223 | goto out_racache; |
224 | ret = lockd_up(net); | 224 | ret = lockd_up(net); |