From patchwork Thu Feb 9 19:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289623wrn; Thu, 9 Feb 2023 03:59:33 -0800 (PST) X-Google-Smtp-Source: AK7set+JATbsKSyG5eTx9ZlMMf7zs4M9Js1kZ+aWxZ5ysx6MPfhBOJVrwU2IUrWzGwyCcwvPbaXw X-Received: by 2002:a05:6a21:30c3:b0:bc:42f9:6b21 with SMTP id yf3-20020a056a2130c300b000bc42f96b21mr7865483pzb.15.1675943973230; Thu, 09 Feb 2023 03:59:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943973; cv=none; d=google.com; s=arc-20160816; b=Iq2m5lyPREMM+llhJdk7K/KUo/tLvF/YqkbVT7YBFQawB2rVBIon04JCurNtntfj3g 9FS0gnYHN0uJPirkIVZW3U5TCC/N7Sp9ILy46bpoZ67o1hoGIbSz7rBEohNI9OZTFE4c 4UlnZG9JcsUxn0q1/1XeKC1v1k57lcuczjdM8nnkbx9F7m2u98yDxk4XNIDQrzG5js1b +pTE25Em4l7EL2iB2c3XQe14d0UHaC/5Gr/qsvcoAXiXB7K0/IyVUhfTJy9X+fAXY+xd 1suKYlBjAqsZTpMcg0skYx9WLHDU9dXEvzwmYcG8IEY4d6NYUL0J2qOn5Zgqe7v9F9Iq RJ/g== 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=OXoyt/wuMq+VxHd3fHJDJj1MfaWFN05o72evFTtum1M=; b=MgtsCeGzyon+ijeyYGi6s0I+NKJtro/IgtSU2CKjE1iyzoV3e2ol9y+frsYlyxiP15 TD29K0yO4XIOsiAPV1Ew0vH4Phtf6yjsoE4U9FsbPa0esVtXyEtlWnDoJpXsx5Qb8ysQ qkuy8NWL63Uhb/LoH42shP3LsAZonQwXQywBsbGzcljJCfgtnaWek8a62LXgXw9PWkUA YfbKtHhkEC8DRUZW0WbBPRp5qWYYNeiNElq2PpaXZvcdtahJXdCeeWgA5i5yoR0m200e qz5d+3vDJt832lUsAjcrNwIKwt9BnXkb5X9egg6HZJQtb0s0K1mW117t91FisDMpsSUj 2XtA== 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 m22-20020a637116000000b004fb37497be2si1765011pgc.642.2023.02.09.03.59.21; Thu, 09 Feb 2023 03:59:33 -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 S230239AbjBIL5b (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229608AbjBIL4N (ORCPT ); Thu, 9 Feb 2023 06:56:13 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 249045C48C; Thu, 9 Feb 2023 03:46:31 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFSd6q5Xz4f3v6t; Thu, 9 Feb 2023 19:46:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S10; Thu, 09 Feb 2023 19:46:28 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/21] ext4: add missed brelse in ext4_free_blocks_simple Date: Fri, 10 Feb 2023 03:48:12 +0800 Message-Id: <20230209194825.511043-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209194825.511043-1-shikemeng@huaweicloud.com> References: <20230209194825.511043-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAn3rEQ3eRjgb0tDQ--.53508S10 X-Coremail-Antispam: 1UD129KBjvJXoW7Ary8Xr1ktw4fGF17ZryfXrb_yoW8XFWkpr 4qyF48GFn3Wr1qgF4xX34UX3W8twn7W3WUGFWrGwnrCrW3J3saqFs7KF1F93W5KFZ3AanI vFn093yrJF4jgFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354627516610826?= X-GMAIL-MSGID: =?utf-8?q?1757354627516610826?= 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 4e1caac74b44..17ac98c501ed 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5848,13 +5848,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)) @@ -5863,7 +5862,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); @@ -5872,6 +5871,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); }