From ec69ffe90ceca82fef20413178cfdbd6555fcc30 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 20 Mar 2006 13:44:41 -0500
Subject: [PATCH] --- yaml --- r: 23927 b: refs/heads/master c:
 35576cba57f1c042b87d6586b3229d13067264c6 h: refs/heads/master i:   23925:
 e875888037290fca59f35b8bfa8215d1f97eff5e   23923:
 3caab2211e870f3e84a801f3b41079e471a71a06   23919:
 ab6dc6037ebdeb455ba62129c4ce8d2137c3cb90 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/lockd/clntproc.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7f6fb50c5d12..e4b7c939b594 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c060b531006e0711db32a132d6ac7661594b280
+refs/heads/master: 35576cba57f1c042b87d6586b3229d13067264c6
diff --git a/trunk/fs/lockd/clntproc.c b/trunk/fs/lockd/clntproc.c
index 3e90356b4882..c25044f3b660 100644
--- a/trunk/fs/lockd/clntproc.c
+++ b/trunk/fs/lockd/clntproc.c
@@ -750,6 +750,7 @@ static void nlmclnt_cancel_callback(struct rpc_task *task, void *data)
 	switch (req->a_res.status) {
 	case NLM_LCK_GRANTED:
 	case NLM_LCK_DENIED_GRACE_PERIOD:
+	case NLM_LCK_DENIED:
 		/* Everything's good */
 		break;
 	case NLM_LCK_DENIED_NOLOCKS: