From cd469fe533b00cd9deef8df94b63403e04373845 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Mon, 20 Feb 2012 23:06:18 -0500
Subject: [PATCH] --- yaml --- r: 296551 b: refs/heads/master c:
 c1bb05a657fb3d8c6179a4ef7980261fae4521d7 h: refs/heads/master i:   296549:
 6d3ac0f1430b0a10b465686568e803c5816cfbcd   296547:
 49de319baf2515359e8dd16861e130573056b1c5   296543:
 8c8a9666dbef6909acf18280de4972781d6f8f02 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/xattr.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 23845173c849..9109a416cabf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0ade1deb86d2325aecc36272bb4505a6eec9235
+refs/heads/master: c1bb05a657fb3d8c6179a4ef7980261fae4521d7
diff --git a/trunk/fs/ext4/xattr.c b/trunk/fs/ext4/xattr.c
index 1bff752d1b59..3369157df852 100644
--- a/trunk/fs/ext4/xattr.c
+++ b/trunk/fs/ext4/xattr.c
@@ -484,18 +484,19 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode,
 		ext4_free_blocks(handle, inode, bh, 0, 1,
 				 EXT4_FREE_BLOCKS_METADATA |
 				 EXT4_FREE_BLOCKS_FORGET);
+		unlock_buffer(bh);
 	} else {
 		le32_add_cpu(&BHDR(bh)->h_refcount, -1);
+		if (ce)
+			mb_cache_entry_release(ce);
+		unlock_buffer(bh);
 		error = ext4_handle_dirty_metadata(handle, inode, bh);
 		if (IS_SYNC(inode))
 			ext4_handle_sync(handle);
 		dquot_free_block(inode, 1);
 		ea_bdebug(bh, "refcount now=%d; releasing",
 			  le32_to_cpu(BHDR(bh)->h_refcount));
-		if (ce)
-			mb_cache_entry_release(ce);
 	}
-	unlock_buffer(bh);
 out:
 	ext4_std_error(inode->i_sb, error);
 	return;