summaryrefslogtreecommitdiff
path: root/fs/lockd/host.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 13:13:22 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 13:13:22 +1100
commit63f5e4897451e2f459db4bf8c7a4d815cde35dfe (patch)
tree5d6d158942bc5fccaf953bb8626822efd7b5476c /fs/lockd/host.c
parente3e2616289802e38e9a6841cf9e6ddc81d9b01c6 (diff)
parent94b31905d384a0138bab95b1948d9e11585d2bbb (diff)
Merge commit 'nfsd/nfsd-next'
Diffstat (limited to 'fs/lockd/host.c')
-rw-r--r--fs/lockd/host.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 9fd8889097b7..70fc63a1727b 100644
--- a/fs/lockd/host.c
+++ b/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. */