From patchwork Fri Sep 7 10:14:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: ext4: fix double unlock buffer mess during fs-resize From: Dmitri Monakho X-Patchwork-Id: 182351 Message-Id: <1347012884-29484-1-git-send-email-dmonakhov@openvz.org> To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, djwong@us.ibm.com, Dmitry Monakhov Date: Fri, 7 Sep 2012 14:14:44 +0400 bh_submit_read() is responsible for unlock bh on endio Signed-off-by: Dmitry Monakhov --- 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; }