diff options
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/clntlock.c | 4 | ||||
-rw-r--r-- | fs/lockd/svc.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index 2976bf0f4147..8307dd64bf46 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 36396fc058c5..c631a83931ce 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 | */ |
233 | int | 233 | int lockd_up(void) |
234 | lockd_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; |