aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfssvc.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-10-03 17:15:30 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-10-04 17:12:27 -0400
commit26a414092353590ceaa5955bcb53f863d6ea7549 (patch)
treed829a751e7f6dee7323039e6ea2340e78e5f9fd6 /fs/nfsd/nfssvc.c
parent8c3916f4bdf9c8388bd70d0b399b3a43daf2087a (diff)
NLM: Remove "proto" argument from lockd_up()
Clean up: Now that lockd_up() starts listeners for both transports, the "proto" argument is no longer needed. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Cc: Neil Brown <neilb@suse.de> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfssvc.c')
-rw-r--r--fs/nfsd/nfssvc.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 7f3d76a7839d..59eeb46f82c5 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -244,25 +244,20 @@ static int nfsd_init_socks(int port)
244 if (!list_empty(&nfsd_serv->sv_permsocks)) 244 if (!list_empty(&nfsd_serv->sv_permsocks))
245 return 0; 245 return 0;
246 246
247 error = lockd_up(IPPROTO_UDP); 247 error = svc_create_xprt(nfsd_serv, "udp", port,
248 if (error >= 0) {
249 error = svc_create_xprt(nfsd_serv, "udp", port,
250 SVC_SOCK_DEFAULTS); 248 SVC_SOCK_DEFAULTS);
251 if (error < 0)
252 lockd_down();
253 }
254 if (error < 0) 249 if (error < 0)
255 return error; 250 return error;
256 251
257 error = lockd_up(IPPROTO_TCP); 252 error = svc_create_xprt(nfsd_serv, "tcp", port,
258 if (error >= 0) {
259 error = svc_create_xprt(nfsd_serv, "tcp", port,
260 SVC_SOCK_DEFAULTS); 253 SVC_SOCK_DEFAULTS);
261 if (error < 0)
262 lockd_down();
263 }
264 if (error < 0) 254 if (error < 0)
265 return error; 255 return error;
256
257 error = lockd_up();
258 if (error < 0)
259 return error;
260
266 return 0; 261 return 0;
267} 262}
268 263