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. */