Message ID | 20230321161220.418652-4-shikemeng@huaweicloud.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1653140wrt; Tue, 21 Mar 2023 01:21:02 -0700 (PDT) X-Google-Smtp-Source: AK7set8ZHysy8oIVARARe89S2PpF855ro/okXHCVIUc411NIiZchzrndUevjWPR1UASudSgzCIlv X-Received: by 2002:a17:903:7cd:b0:1a0:4ebd:15d5 with SMTP id ko13-20020a17090307cd00b001a04ebd15d5mr1214230plb.67.1679386861886; Tue, 21 Mar 2023 01:21:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386861; cv=none; d=google.com; s=arc-20160816; b=k3cJwnH+DKXRdP8rOput3q+VOAnluNuPPQ4oVypUcxHEe8BUwfmebm2erBfOLV13x0 p3MLSnW95WpPIlxdLp0T0yIuY3YC5RyAzvKY9wQQHBcYcm3Zm3QgHzjgmc++Di6ryjfH 86myzyh3ImHedimIXFX2wfmNIK3gbYrUo1g/X6liDTYo/yDomYltiNPVy8O56Q4+5TCX Mm4ALW3Kky0FYGZkP09KC+MooHWzLMuPw34N+EEQ6aDLCpaUmGYNfyPXQXk6EsEKV2Gz pmxF7pcoqH9A0y5rwioVN3ku+i+peLpwMf277nOkAW+YN+dHIh39hA3yxtcipXvMMNYj bBUQ== 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=a8GJSZvNkP45/MwrUw15gq3ah4mkPmilQlLnwUMUFr4=; b=VkDIHAikVtJbnacmQZDUMDs3bD+jieZzFRRqWOg4Jd4Og3f201q4iOYisgSquP/o28 NJKDzlTEsZu9dw1E174+A3trf5ejIrXwgRhblbZlXmmISaSfElFl2v/jWfSHKf/Wbsa3 s7xsl+MDqBTbe5N7jMiS9yyO8cNLFWONcNLs4ReDyr4Ld8cLJ+Zz8OUhqbxi/YCDYvhB kSMg8P+G6LKyxiysFmgVmm2ODEv8AzBVPfpyXWwAK5ikOtOlA7lauYO5bs+fe2gC3Rqu xJ1B9FGzFWGTZjBFYEzmiFX9FRzwcPrcA48aWsOIjJZLyxC+TKGvqT+RSKAU/1dGQF5V e6dg== 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 x26-20020a63171a000000b005077dda0477si13035101pgl.802.2023.03.21.01.20.48; Tue, 21 Mar 2023 01:21:01 -0700 (PDT) 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 S230358AbjCUIJd (ORCPT <rfc822;pusanteemu@gmail.com> + 99 others); Tue, 21 Mar 2023 04:09:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230298AbjCUIJb (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 21 Mar 2023 04:09:31 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EB2F1ABC5; Tue, 21 Mar 2023 01:09:28 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Pgklm0lw2z4f3vdV; Tue, 21 Mar 2023 16:09:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S5; Tue, 21 Mar 2023 16:09:25 +0800 (CST) From: Kemeng Shi <shikemeng@huaweicloud.com> To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ojaswin@linux.ibm.com, shikemeng@huaweicloud.com Subject: [PATCH 3/8] ext4: fix wrong unit use in ext4_mb_new_inode_pa Date: Wed, 22 Mar 2023 00:12:15 +0800 Message-Id: <20230321161220.418652-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230321161220.418652-1-shikemeng@huaweicloud.com> References: <20230321161220.418652-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: gCh0CgDnnbEzZhlk+NQhFw--.4478S5 X-Coremail-Antispam: 1UD129KBjvdXoW7JrWUKw47uF4kZry7GryUWrg_yoW3Zrc_Ca 1DCr4IvFyrtr1I9a1Syay8Ar9YgF1kJr4jqr45try3ZF18ur42kwsFvr45XayxGry7A3sx G3WYgr1FgF1S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6I AqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTR HMKAUUUUU 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_PASS 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760964758008718677?= X-GMAIL-MSGID: =?utf-8?q?1760964758008718677?= |
Series |
Some fixes and cleanup to mballoc
|
|
Commit Message
Kemeng Shi
March 21, 2023, 4:12 p.m. UTC
fe_logical and win are both in block unit. Remove wrong convertion for
win from block unit to cluster unit.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
fs/ext4/mballoc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Comments
On Wed, Mar 22, 2023 at 12:12:15AM +0800, Kemeng Shi wrote: > fe_logical and win are both in block unit. Remove wrong convertion for > win from block unit to cluster unit. > > Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> > --- > 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 7f695830621a..86d978e1f7dc 100644 > --- a/fs/ext4/mballoc.c > +++ b/fs/ext4/mballoc.c > @@ -4640,8 +4640,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) > if (offs && offs < win) > win = offs; > > - ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - > - EXT4_NUM_B2C(sbi, win); > + ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - win; > BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); > BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); So this bit of code is removed in the patchset I sent here [1]. My patchset is mostly ready to be merged and Ted did mention that he was going to pick that up soon. So would it be okay with you if we drop this particular patch? [1] https://lore.kernel.org/linux-ext4/9b35f3955a1d7b66bbd713eca1e63026e01f78c1.1679731817.git.ojaswin@linux.ibm.com > } > -- > 2.30.0 >
on 4/6/2023 3:26 AM, Ojaswin Mujoo wrote: > On Wed, Mar 22, 2023 at 12:12:15AM +0800, Kemeng Shi wrote: >> fe_logical and win are both in block unit. Remove wrong convertion for >> win from block unit to cluster unit. >> >> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> >> --- >> 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 7f695830621a..86d978e1f7dc 100644 >> --- a/fs/ext4/mballoc.c >> +++ b/fs/ext4/mballoc.c >> @@ -4640,8 +4640,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) >> if (offs && offs < win) >> win = offs; >> >> - ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - >> - EXT4_NUM_B2C(sbi, win); >> + ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - win; >> BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); >> BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); > > So this bit of code is removed in the patchset I sent here [1]. My patchset > is mostly ready to be merged and Ted did mention that he was going to > pick that up soon. So would it be okay with you if we drop this particular patch? Sure, I will drop this in next version. >> } >> -- >> 2.30.0 >> >
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 7f695830621a..86d978e1f7dc 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4640,8 +4640,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) if (offs && offs < win) win = offs; - ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - - EXT4_NUM_B2C(sbi, win); + ac->ac_b_ex.fe_logical = ac->ac_o_ex.fe_logical - win; BUG_ON(ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); }