From 2093ba6b4a24257dc87ae3f484d3d4f79b1932ed Mon Sep 17 00:00:00 2001
From: Goldwyn Rodrigues <rgoldwyn@gmail.com>
Date: Thu, 20 Aug 2009 13:43:19 -0500
Subject: [PATCH] --- yaml --- r: 157055 b: refs/heads/master c:
 c795b33ba171e41563ab7e25105c0cd4edd81cd7 h: refs/heads/master i:   157053:
 c8bc815f0447da769a68dc8522cd8fbc0737f340   157051:
 cd1120b8af024e3711d4467b96a7c4814c552171   157047:
 1df9264a033540454dd739fe3bf4a63a21bdb3dd   157039:
 1872bc83e3f2720056db88ebcf0de8d560d58436   157023:
 bd611e8641217b2f0f02f50142273feb34442cbc   156991:
 3cba487d3a3bd91990d6ed2e0e823e8db62a3592   156927:
 24e2f77cf996f9420df9d7eefe97510f5c62b048 v: v3

---
 [refs]                         | 2 +-
 trunk/fs/ocfs2/dlm/dlmunlock.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b4b6cd9010a..25ae7575542d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8b88d3d49623ac701b5dc996cbd61219c793c7c
+refs/heads/master: c795b33ba171e41563ab7e25105c0cd4edd81cd7
diff --git a/trunk/fs/ocfs2/dlm/dlmunlock.c b/trunk/fs/ocfs2/dlm/dlmunlock.c
index fcf879ed6930..756f5b0998e0 100644
--- a/trunk/fs/ocfs2/dlm/dlmunlock.c
+++ b/trunk/fs/ocfs2/dlm/dlmunlock.c
@@ -122,7 +122,7 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm,
 	 * that still has AST's pending... */
 	in_use = !list_empty(&lock->ast_list);
 	spin_unlock(&dlm->ast_lock);
-	if (in_use) {
+	if (in_use && !(flags & LKM_CANCEL)) {
 	       mlog(ML_ERROR, "lockres %.*s: Someone is calling dlmunlock "
 		    "while waiting for an ast!", res->lockname.len,
 		    res->lockname.name);
@@ -131,7 +131,7 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm,
 
 	spin_lock(&res->spinlock);
 	if (res->state & DLM_LOCK_RES_IN_PROGRESS) {
-		if (master_node) {
+		if (master_node && !(flags & LKM_CANCEL)) {
 			mlog(ML_ERROR, "lockres in progress!\n");
 			spin_unlock(&res->spinlock);
 			return DLM_FORWARD;