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>

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index b10f913aa06ae44f7d797920ed9e981b610caa5d..ac4a700af01ac974278586340d536b1abee35dc3 100644 (file)
--- 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)
        if (!(call = nlmclnt_alloc_call()))
                return rpc_system_err;
 
-       host = nlmclnt_lookup_host(&rqstp->rq_addr,
-                               rqstp->rq_prot, rqstp->rq_vers);
+       host = nlmsvc_lookup_host(rqstp);
        if (!host) {
                kfree(call);
                return rpc_system_err;

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 3c7dd956d9c1d0c98f81bf51811cb14c6c125c62..a95d260b713790214ef0865c20e15bb641290194 100644 (file)
--- 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,
        struct nlm_rqst         *call;
 
        /* Create host handle for callback */
-       host = nlmclnt_lookup_host(&rqstp->rq_addr,
-                               rqstp->rq_prot, rqstp->rq_vers);
+       host = nlmsvc_lookup_host(rqstp);
        if (host == NULL)
                return NULL;
 

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 35681d9cf1fcf52ca816249221a5b4c48b293c4e..4986fbe44540f4db0c46b84ab8cd78b470ee3a41 100644 (file)
--- 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)
        if (!(call = nlmclnt_alloc_call()))
                return rpc_system_err;
 
-       host = nlmclnt_lookup_host(&rqstp->rq_addr,
-                               rqstp->rq_prot, rqstp->rq_vers);
+       host = nlmsvc_lookup_host(rqstp);
        if (!host) {
                kfree(call);
                return rpc_system_err;