aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd
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/lockd
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/lockd')
-rw-r--r--fs/lockd/clntlock.c4
-rw-r--r--fs/lockd/svc.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 2976bf0f414..8307dd64bf4 100644
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -54,7 +54,7 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init)
54 u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4; 54 u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4;
55 int status; 55 int status;
56 56
57 status = lockd_up(nlm_init->protocol); 57 status = lockd_up();
58 if (status < 0) 58 if (status < 0)
59 return ERR_PTR(status); 59 return ERR_PTR(status);
60 60
@@ -215,7 +215,7 @@ reclaimer(void *ptr)
215 /* This one ensures that our parent doesn't terminate while the 215 /* This one ensures that our parent doesn't terminate while the
216 * reclaim is in progress */ 216 * reclaim is in progress */
217 lock_kernel(); 217 lock_kernel();
218 lockd_up(0); /* note: this cannot fail as lockd is already running */ 218 lockd_up(); /* note: this cannot fail as lockd is already running */
219 219
220 dprintk("lockd: reclaiming locks for host %s\n", host->h_name); 220 dprintk("lockd: reclaiming locks for host %s\n", host->h_name);
221 221
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 36396fc058c..c631a83931c 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -230,8 +230,7 @@ static int make_socks(struct svc_serv *serv)
230/* 230/*
231 * Bring up the lockd process if it's not already up. 231 * Bring up the lockd process if it's not already up.
232 */ 232 */
233int 233int lockd_up(void)
234lockd_up(int proto) /* Maybe add a 'family' option when IPv6 is supported ?? */
235{ 234{
236 struct svc_serv *serv; 235 struct svc_serv *serv;
237 int error = 0; 236 int error = 0;