---

yaml --- r: 229001 b: refs/heads/master c: 1e6d915 h: refs/heads/master i: 228999: 838f504 v: v3
git-mirror · Dec 23, 2010 · 362ac89 · 362ac89
1 parent 07b811e
commit 362ac89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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);