---

yaml --- r: 23927 b: refs/heads/master c: 35576cb h: refs/heads/master i: 23925: e875888 23923: 3caab22 23919: ab6dc60 v: v3
git-mirror · Mar 20, 2006 · ec69ffe · ec69ffe
1 parent fbc78d9
commit ec69ffe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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: