From patchwork Tue Feb 28 11:42:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 62251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2791963wrd; Mon, 27 Feb 2023 19:45:27 -0800 (PST) X-Google-Smtp-Source: AK7set+iYpUeI5f9t726cUtI7FIZPFx3ELrfhxLJgeilW3UsAO3oQDkMl99w89OgxI6GwtydKzMS X-Received: by 2002:a17:90b:4ad1:b0:230:af67:b847 with SMTP id mh17-20020a17090b4ad100b00230af67b847mr1619903pjb.31.1677555926959; Mon, 27 Feb 2023 19:45:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677555926; cv=none; d=google.com; s=arc-20160816; b=cRDbKU3pu31GlsXuBpYa18HDn7W3vVAlZuD7SQVl5n+zE+c7vhdWGiaSMG124g9umu ArKipN2NC+zuIiWCXTKjYhliZ+17JCGGzGhIfUbuS9Aa9J93UfN/yZGkZ59E/9ezTXwm cKcHPNmxdFrBv2XXa+uqmqfFpWIex9ZR/7KMwYnssWhkg5h5601wmzSfFmpM1luNbx0p GUxAYf4aXj77kYumnu2NXbdVewHu6Esxl/h51E6ZVmcV+Zyf2/o4aX7rxU72NZz2VPSW KkTA4APtJcnZMx4qeUbEyENIkiKx8/BGmKMHKM4HR5P77/ABezBkVe5FetfmJVvSL6DU fSEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BY/WPkUKrXJKx05PLESD+IEcLwllrhIX/sTGjSo3MGc=; b=0Gjz4cnqj/LjsjmbKXdgaHmgKIX38wCV572jl6z2eqLCEM2CxXU7w1obCf36QLJ8HF lAZoHO6yewhilR/CF+HzAtffg1t7dELGgfcLInXbFN/coAtBKhnuraJmXl6B4qY9zolU Cj2ZKUP79NjFmckF3Jxcf0soVJhHTub0wBy8rKmfAyA7WOkz+zkjQfB3X8lL9PHNa9o/ n37NfwFB7KeiDEzROH+OFQQLlwdw4AS6vCvUrYo7xpu59zFowUnSiGFRriOtWFjqcaQW tHrkht+qh8J0SNfRwK76zW4cP+OZxSvkGepBa84oPgaLN7wn3SXbtSQxFjKo17eFCxo8 0wIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mr11-20020a17090b238b00b00233e889b984si12393987pjb.166.2023.02.27.19.45.13; Mon, 27 Feb 2023 19:45:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230260AbjB1DmI (ORCPT + 99 others); Mon, 27 Feb 2023 22:42:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbjB1Dli (ORCPT ); Mon, 27 Feb 2023 22:41:38 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7005324CA8; Mon, 27 Feb 2023 19:41:35 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PQjpM0M2Gz4f3vfN; Tue, 28 Feb 2023 11:41:31 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgDnjOrod_1jpDeZEQ--.58449S9; Tue, 28 Feb 2023 11:41:32 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 07/20] ext4: add missed brelse in ext4_free_blocks_simple Date: Tue, 28 Feb 2023 19:42:53 +0800 Message-Id: <20230228114306.3328235-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230228114306.3328235-1-shikemeng@huaweicloud.com> References: <20230228114306.3328235-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnjOrod_1jpDeZEQ--.58449S9 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar4kXF15Gr4Duw47Zr1DZFb_yoW8Wry3pr 4qkF4UGFn5Gr1DWF4xX34UX3W8twn7W3WUGFyrGwnrCrWayr9aqFs7KF1F93WYkFWfZanI vFn09r4rJF4jgFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759044883625005555?= X-GMAIL-MSGID: =?utf-8?q?1759044883625005555?= Release bitmap buffer_head we got if error occurs. Besides, this patch remove unused assignment to err. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index aec4a7b7af20..c26421170406 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5845,13 +5845,12 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, ext4_get_group_no_and_offset(sb, block, &group, &blkoff); bitmap_bh = ext4_read_block_bitmap(sb, group); if (IS_ERR(bitmap_bh)) { - err = PTR_ERR(bitmap_bh); pr_warn("Failed to read block bitmap\n"); return; } gdp = ext4_get_group_desc(sb, group, &gdp_bh); if (!gdp) - return; + goto err_out; for (i = 0; i < count; i++) { if (!mb_test_bit(blkoff + i, bitmap_bh->b_data)) @@ -5860,7 +5859,7 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, mb_clear_bits(bitmap_bh->b_data, blkoff, count); err = ext4_handle_dirty_metadata(NULL, NULL, bitmap_bh); if (err) - return; + goto err_out; ext4_free_group_clusters_set( sb, gdp, ext4_free_group_clusters(sb, gdp) + count - already_freed); @@ -5869,6 +5868,8 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, ext4_handle_dirty_metadata(NULL, NULL, gdp_bh); sync_dirty_buffer(bitmap_bh); sync_dirty_buffer(gdp_bh); + +err_out: brelse(bitmap_bh); }