From 362ac89df382aed26879095c7f0b91cbe719c91f Mon Sep 17 00:00:00 2001
From: Tao Ma <boyu.mt@taobao.com>
Date: Mon, 20 Dec 2010 16:21:11 +0800
Subject: [PATCH] --- yaml --- r: 229001 b: refs/heads/master c:
 1e6d9153df27923649976554d034a69ac7b28f95 h: refs/heads/master i:   228999:
 838f504609ac0110adb1fde8b43a02c4addc5363 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/namei.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f55568d816fc..51ffc85ab45c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfc069d3fa24d7c6357e3b731e97f94db495bf0c
+refs/heads/master: 1e6d9153df27923649976554d034a69ac7b28f95
diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c
index ff5744e1e36f..ca35f81a13bb 100644
--- a/trunk/fs/ocfs2/namei.c
+++ b/trunk/fs/ocfs2/namei.c
@@ -1017,8 +1017,11 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
 		 * An error return must mean that no cluster locks
 		 * were held on function exit.
 		 */
-		if (oi1->ip_blkno != oi2->ip_blkno)
+		if (oi1->ip_blkno != oi2->ip_blkno) {
 			ocfs2_inode_unlock(inode2, 1);
+			brelse(*bh2);
+			*bh2 = NULL;
+		}
 
 		if (status != -ENOENT)
 			mlog_errno(status);