diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 13:44:39 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 13:44:39 -0500 |
commit | 686517f1ad1630c11964d668b556aab79b8c942e (patch) | |
tree | fc62470bef473ce51f6caddb3b187da756b8bffc | |
parent | 5e1abf8cb713a0b94f5a400c7b9b797990cd9dec (diff) |
lockd: Make nlmsvc_create_block() use nlmsvc_lookup_host()
Currently it uses nlmclnt_lookup_host(), which puts the resulting host
structure on a different list.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/lockd/svc4proc.c | 3 | ||||
-rw-r--r-- | fs/lockd/svclock.c | 3 | ||||
-rw-r--r-- | fs/lockd/svcproc.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index b10f913aa06a..ac4a700af01a 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c | |||
@@ -483,8 +483,7 @@ nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_res *resp) | |||
483 | if (!(call = nlmclnt_alloc_call())) | 483 | if (!(call = nlmclnt_alloc_call())) |
484 | return rpc_system_err; | 484 | return rpc_system_err; |
485 | 485 | ||
486 | host = nlmclnt_lookup_host(&rqstp->rq_addr, | 486 | host = nlmsvc_lookup_host(rqstp); |
487 | rqstp->rq_prot, rqstp->rq_vers); | ||
488 | if (!host) { | 487 | if (!host) { |
489 | kfree(call); | 488 | kfree(call); |
490 | return rpc_system_err; | 489 | return rpc_system_err; |
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 3c7dd956d9c1..a95d260b7137 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
@@ -185,8 +185,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_file *file, | |||
185 | struct nlm_rqst *call; | 185 | struct nlm_rqst *call; |
186 | 186 | ||
187 | /* Create host handle for callback */ | 187 | /* Create host handle for callback */ |
188 | host = nlmclnt_lookup_host(&rqstp->rq_addr, | 188 | host = nlmsvc_lookup_host(rqstp); |
189 | rqstp->rq_prot, rqstp->rq_vers); | ||
190 | if (host == NULL) | 189 | if (host == NULL) |
191 | return NULL; | 190 | return NULL; |
192 | 191 | ||
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 35681d9cf1fc..4986fbe44540 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
@@ -508,8 +508,7 @@ nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_res *resp) | |||
508 | if (!(call = nlmclnt_alloc_call())) | 508 | if (!(call = nlmclnt_alloc_call())) |
509 | return rpc_system_err; | 509 | return rpc_system_err; |
510 | 510 | ||
511 | host = nlmclnt_lookup_host(&rqstp->rq_addr, | 511 | host = nlmsvc_lookup_host(rqstp); |
512 | rqstp->rq_prot, rqstp->rq_vers); | ||
513 | if (!host) { | 512 | if (!host) { |
514 | kfree(call); | 513 | kfree(call); |
515 | return rpc_system_err; | 514 | return rpc_system_err; |