Re: [PATCH] PING ext4: fix double unlock buffer mess during fs-resize
From: Dmitry Monakhov <hidden>
Date: 2012-09-25 15:25:22
On Fri, 7 Sep 2012 14:14:44 +0400, Dmitry Monakhov [off-list ref] wrote:
bh_submit_read() is responsible for unlock bh on endio
Hi, are any objections against this fix?
quoted hunk ↗ jump to hunk
Signed-off-by: Dmitry Monakhov <redacted> --- fs/ext4/resize.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-)diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 41f6ef6..3b05198 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c@@ -1076,17 +1076,12 @@ static struct buffer_head *ext4_get_bitmap(struct super_block *sb, __u64 block) struct buffer_head *bh = sb_getblk(sb, block); if (!bh) return NULL; - - if (bitmap_uptodate(bh)) - return bh; - - lock_buffer(bh); - if (bh_submit_read(bh) < 0) { - unlock_buffer(bh); - brelse(bh); - return NULL; + if (!bh_uptodate_or_lock(bh)) { + if (bh_submit_read(bh) < 0) { + brelse(bh); + return NULL; + } } - unlock_buffer(bh); return bh; }-- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html