From aa27a981e09445614e43ab87941b336310e0a84d Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 24 Nov 2008 12:51:55 -0500
Subject: [PATCH] --- yaml --- r: 119663 b: refs/heads/master c:
 a8d82d9b950213b66b22c9e7c63a058841de2394 h: refs/heads/master i:   119661:
 720d57b9d87b12640f578010ed4093cf24dde5d3   119659:
 0949c8cdcbc6872d8205929d8718a96db468e68f   119655:
 a0d605e41be14758082da92b1ef0a12e804a53d9   119647:
 26916036195a05d826125f73d49a73fccf60b65a v: v3

---
 [refs]                | 2 +-
 trunk/fs/lockd/host.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a5d80dbd3217..c024754551b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4625eb826de4f6774ee602c442ba23b686bdcc7
+refs/heads/master: a8d82d9b950213b66b22c9e7c63a058841de2394
diff --git a/trunk/fs/lockd/host.c b/trunk/fs/lockd/host.c
index 9fd8889097b7..70fc63a1727b 100644
--- a/trunk/fs/lockd/host.c
+++ b/trunk/fs/lockd/host.c
@@ -167,7 +167,8 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni)
 			continue;
 		if (host->h_server != ni->server)
 			continue;
-		if (!nlm_cmp_addr(nlm_srcaddr(host), ni->src_sap))
+		if (ni->server &&
+		    !nlm_cmp_addr(nlm_srcaddr(host), ni->src_sap))
 			continue;
 
 		/* Move to head of hash chain. */