From patchwork Thu Feb 9 19:48:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289297wrn; Thu, 9 Feb 2023 03:58:49 -0800 (PST) X-Google-Smtp-Source: AK7set9CJO6tdl3CGt2h2NhD/nuHjEuKWCwmEdMq+ZwkZWxQqJrQZqKVlPCxY/nzw7xSlkXeDi3c X-Received: by 2002:a05:6a20:1e43:b0:bc:5a6:1b2a with SMTP id cy3-20020a056a201e4300b000bc05a61b2amr10082480pzb.49.1675943929229; Thu, 09 Feb 2023 03:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943929; cv=none; d=google.com; s=arc-20160816; b=k/zarRJ+ZC1vBTsmBi2Lm0/uyKxMuzOAJJFGQd9NCe2Kd+JUv1kYEVp1DMsurYpu2y aCOOaKoG23KaLVqMh+Q7q7kJWrbpZTpm5dulkg4cYrd9jmV92EOzIpWGfWtzZ9tghJu2 qCsu8koTFZU+Wixukm9ewlRl22Nu++4ez8T/UBy35FXNbJbErhTga9YVouspZA9t4QrE tL/5xpj4PpKgHY7PVm04JsgQGSXYIexmNl19bBps5d0D4ov7UcWQ/QjuBNjpVvmjn2eK azqdPAUazLcs8FB3l8Qj9O7ARFMT1+sdP78aRYGPpbbD4gEbzhKGHN72ygMv5JW02Hg2 ALlw== 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=51kPPZA1gVrmw7VQVo7EeNrAgCsOSRoMk6BixNs2KQM=; b=u1jejU9WVHhBuKrGRtUJlU7xV6kWuEJeCBz+X4DOMWEA4iXSZhn1EB1t6oV+CX638q aWGfFJry4bJXc70CecDBE3OOqofdrEyD+Np53Axv8sxdM6u1l7W4zjMZob+xRh0rJdAP /pxa+q+trp+jLcI+C/UHJziGUkg3pYcmC+2V5efsipbwB73aQzQExLZuNthku8X/XuIZ fcFz/1rhgABqm/VZptP9R42YlYpYIvG55t//dsZhZpzjyxVTGG4O4lNzHCoZH3VIzA2b VSGViLZXeH5GHq3nxSHeWz877Ub53zaEgNC1CmfU5Ny/6458ZnpPotGweXvw0bcbBmYL RQ8g== 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 d6-20020aa797a6000000b00593e5a07bf3si1554552pfq.253.2023.02.09.03.58.31; Thu, 09 Feb 2023 03:58:49 -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 S230323AbjBIL5r (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229761AbjBIL4O (ORCPT ); Thu, 9 Feb 2023 06:56:14 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF38F5C495; 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 4PCFSf6FNhz4f3v75; Thu, 9 Feb 2023 19:46:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S13; Thu, 09 Feb 2023 19:46:29 +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 11/21] ext4: remove unnecessary e4b->bd_buddy_page check in ext4_mb_load_buddy_gfp Date: Fri, 10 Feb 2023 03:48:15 +0800 Message-Id: <20230209194825.511043-12-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--.53508S13 X-Coremail-Antispam: 1UD129KBjvdXoWrZr1rGF1Uuw1xKw13Cry7GFg_yoW3Arc_Ga 4I9r48tr4rJryqkF1xZwsIyws8KanY9rWUXFZ3tryUZFyUZrWDZw1kZr1Fya1xuFy29rW5 CF13ZF9rJFW09jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x 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?1757354581376066524?= X-GMAIL-MSGID: =?utf-8?q?1757354581376066524?= e4b->bd_buddy_page is only set if we initialize ext4_buddy successfully. So e4b->bd_buddy_page is always NULL in error handle branch. Just remove the dead check. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 15fc7105becc..74da24c9bf14 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1555,8 +1555,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, put_page(page); if (e4b->bd_bitmap_page) put_page(e4b->bd_bitmap_page); - if (e4b->bd_buddy_page) - put_page(e4b->bd_buddy_page); + e4b->bd_buddy = NULL; e4b->bd_bitmap = NULL; return ret;