From 3caab2211e870f3e84a801f3b41079e471a71a06 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 20 Mar 2006 13:44:39 -0500
Subject: [PATCH] --- yaml --- r: 23923 b: refs/heads/master c:
 686517f1ad1630c11964d668b556aab79b8c942e h: refs/heads/master i:   23921:
 da32374a247bf8098e522666e286005406a68d87   23919:
 ab6dc6037ebdeb455ba62129c4ce8d2137c3cb90 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/lockd/svc4proc.c | 3 +--
 trunk/fs/lockd/svclock.c  | 3 +--
 trunk/fs/lockd/svcproc.c  | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 50eca9b44863..4c8fbf34a398 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e1abf8cb713a0b94f5a400c7b9b797990cd9dec
+refs/heads/master: 686517f1ad1630c11964d668b556aab79b8c942e
diff --git a/trunk/fs/lockd/svc4proc.c b/trunk/fs/lockd/svc4proc.c
index b10f913aa06a..ac4a700af01a 100644
--- a/trunk/fs/lockd/svc4proc.c
+++ b/trunk/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/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
index 3c7dd956d9c1..a95d260b7137 100644
--- a/trunk/fs/lockd/svclock.c
+++ b/trunk/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/trunk/fs/lockd/svcproc.c b/trunk/fs/lockd/svcproc.c
index 35681d9cf1fc..4986fbe44540 100644
--- a/trunk/fs/lockd/svcproc.c
+++ b/trunk/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;