From d689dc713a7d3296aeeae58e238e65b43fc85e5a Mon Sep 17 00:00:00 2001
From: Sunil Mushran <sunil.mushran@oracle.com>
Date: Thu, 29 Jan 2009 17:12:31 -0800
Subject: [PATCH] --- yaml --- r: 130828 b: refs/heads/master c:
 a4b91965d39d5d53b470d6aa62cba155a6f3ffe1 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ocfs2/dlmglue.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fe165da478d1..a5b4230fc275 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 554e7f9e043e29da79c044f7a55efe4fad40701e
+refs/heads/master: a4b91965d39d5d53b470d6aa62cba155a6f3ffe1
diff --git a/trunk/fs/ocfs2/dlmglue.c b/trunk/fs/ocfs2/dlmglue.c
index b0c4cadd4c45..206a2370876a 100644
--- a/trunk/fs/ocfs2/dlmglue.c
+++ b/trunk/fs/ocfs2/dlmglue.c
@@ -2860,6 +2860,10 @@ static void ocfs2_unlock_ast(void *opaque, int error)
 	case OCFS2_UNLOCK_CANCEL_CONVERT:
 		mlog(0, "Cancel convert success for %s\n", lockres->l_name);
 		lockres->l_action = OCFS2_AST_INVALID;
+		/* Downconvert thread may have requeued this lock, we
+		 * need to wake it. */
+		if (lockres->l_flags & OCFS2_LOCK_BLOCKED)
+			ocfs2_wake_downconvert_thread(ocfs2_get_lockres_osb(lockres));
 		break;
 	case OCFS2_UNLOCK_DROP_LOCK:
 		lockres->l_level = DLM_LOCK_IV;