From patchwork Fri Sep 7 10:14:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 182351 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 62AAF2C0098 for ; Fri, 7 Sep 2012 20:14:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760341Ab2IGKOv (ORCPT ); Fri, 7 Sep 2012 06:14:51 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:45082 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760334Ab2IGKOv (ORCPT ); Fri, 7 Sep 2012 06:14:51 -0400 Received: by lbbgj3 with SMTP id gj3so1764197lbb.19 for ; Fri, 07 Sep 2012 03:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=eLzQ4CfMFAHyABQRIHQAkVAg+549slqNcebhupclwXc=; b=WyL+7B4ngD1+idiiXgfbG+w/hvNzBvrOQiite+BP3k7gpDpTI97y+B0xBxOF9Nbb4j /X7mROBMOZEs/iEPxbZk6Xqh+4AsOVCo3hb6TNjo/L9aVhDgJmXF1j+qFR5mKwyBMFUv whhpO+fS3djqCHNlwoc83iyXVtCIPIJCa62wbQUCZZ3TMbLH3CHb+2/PLmFe7mLE+eMa +eFldavTA/II8GBI0UFYBmnaV6VhXdhZK3tJ3LkuzO/IWWYaf2yeEU8mx/fM6gDfO4cb 3dBgwzY+7f2HdFdZFfluayz28MqI7xR7GsIH5G4gtlKxV/D4/ybEel6okCzXqNQHjNGv e78Q== Received: by 10.112.38.69 with SMTP id e5mr1905674lbk.14.1347012889474; Fri, 07 Sep 2012 03:14:49 -0700 (PDT) Received: from smtp.gmail.com (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id fv16sm4766846lab.9.2012.09.07.03.14.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 03:14:48 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, djwong@us.ibm.com, Dmitry Monakhov Subject: [PATCH] ext4: fix double unlock buffer mess during fs-resize Date: Fri, 7 Sep 2012 14:14:44 +0400 Message-Id: <1347012884-29484-1-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.7.7.6 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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; }