From cd82b5ce8640565dd3d4042e3c1887206bf804f2 Mon Sep 17 00:00:00 2001
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
Date: Wed, 27 Jul 2011 20:40:18 -0400
Subject: [PATCH] --- yaml --- r: 262126 b: refs/heads/master c:
 e6075e984d100c12bb79267639c3f661d9788a67 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ext4/resize.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 323ca38e343f..b54464e0e585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d40bc5a7e8fc71795d131e835f38f161ed7e1b1
+refs/heads/master: e6075e984d100c12bb79267639c3f661d9788a67
diff --git a/trunk/fs/ext4/resize.c b/trunk/fs/ext4/resize.c
index 5b423f89efda..65e5cb6c094d 100644
--- a/trunk/fs/ext4/resize.c
+++ b/trunk/fs/ext4/resize.c
@@ -147,10 +147,8 @@ static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,
 		brelse(bh);
 		bh = ERR_PTR(err);
 	} else {
-		lock_buffer(bh);
 		memset(bh->b_data, 0, sb->s_blocksize);
 		set_buffer_uptodate(bh);
-		unlock_buffer(bh);
 	}
 
 	return bh;
@@ -229,10 +227,8 @@ static int setup_new_group_blocks(struct super_block *sb,
 			brelse(gdb);
 			goto exit_journal;
 		}
-		lock_buffer(gdb);
 		memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, gdb->b_size);
 		set_buffer_uptodate(gdb);
-		unlock_buffer(gdb);
 		err = ext4_handle_dirty_metadata(handle, NULL, gdb);
 		if (unlikely(err)) {
 			brelse(gdb);