From patchwork Wed Apr 12 17:28:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 82351 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp199027vqo; Wed, 12 Apr 2023 02:56:09 -0700 (PDT) X-Google-Smtp-Source: AKy350aH6ndTvPjGFFqtFlnQbSQA8Skz0t90824a8XW7BGFJSShaHgowfewAUeUifJLah9yEnAeX X-Received: by 2002:a17:90b:3ec4:b0:234:106a:34ab with SMTP id rm4-20020a17090b3ec400b00234106a34abmr21865272pjb.6.1681293369536; Wed, 12 Apr 2023 02:56:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681293369; cv=none; d=google.com; s=arc-20160816; b=dfijE3mM1/7Bcv3NA/xMF/cOEsPWLu5k6EmeOQvCouZZsQ8k9kOxgl3R6kC0NwW1m6 vfduxCALDGsSuHI90sRxB7eluri4jLU5MWZotIHysVF9fQ8PCzfC4nJ/Pbtq6SS4c4b0 WRuQSMM91tKiNWDvrGGrj4CKcyoWgzHS/BTPnAKLiu6xDNEslijvmvlRI0D5bK4lLYHV HmJbU5BwrXrKBuFmFHlSVRYKhMjpTjtKBxIY8BmyWPzWdideNuqN3t6ZETW5M3oLiRED x7DeIS88LE34F/3994gcjZIKRLdi/U62jJ6+OB0Sn9SjvYyE3n9PETLDXRtdUIuAiyHq V7eA== 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=Wo40aQWKojukTj94kInfwX4NM4C1h1kqOkwW46/fyOg=; b=wOpgZteVnfO+vma44RR0hdVOux8xQmiWmFR/Ql52vek0hJBilqk3q/0xN6/W2XQYFi JFL1gcRbqcYATlL3/gmxV3UPhxGWS15rlERlLDmGrzEPt4AdEoA7gnrQdpOrEanriYFF Jx+JDnl5oVVF1auu5uZwSYkflamRID5mdg0YxpuWNz/HGoWCccD/asjrJAgomBtcpBhu jAvd51AZQ3nTY2lROjoCsfIFqezpLiWCRQ2d0cgkCdznezAGM3qwn1pTXWf7Am8Tknpv Ec00vQziK9KjIPRf2sM3rX/tY+jzZuZoqaJZsFy6vYN9Izhk/khBU+TrGyrjkTYwQPUX kEig== 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 c4-20020a17090abf0400b0024080f3b7basi1554942pjs.36.2023.04.12.02.55.58; Wed, 12 Apr 2023 02:56:09 -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 S229817AbjDLJ0w (ORCPT + 99 others); Wed, 12 Apr 2023 05:26:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230109AbjDLJ0Q (ORCPT ); Wed, 12 Apr 2023 05:26:16 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BD097EF5; Wed, 12 Apr 2023 02:26:13 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PxHQ90Sv3z4f4cmM; Wed, 12 Apr 2023 17:26:09 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDHL7MpeTZkL5_1HA--.3769S12; Wed, 12 Apr 2023 17:26:10 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 10/19] ext4: fix wrong unit use in ext4_mb_clear_bb Date: Thu, 13 Apr 2023 01:28:24 +0800 Message-Id: <20230412172833.2317696-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230412172833.2317696-1-shikemeng@huaweicloud.com> References: <20230412172833.2317696-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDHL7MpeTZkL5_1HA--.3769S12 X-Coremail-Antispam: 1UD129KBjvdXoW7Wr1rAr4xZw1UuF15Jw4UXFb_yoW3Kwb_K3 WDArWkGryrJwn3CF1ftw45tFZ0gF40kFykXFyfKF4xuF15XFZ7u34DGrW3Ar1xWay3t3y3 CFnYvryfCFWS9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762963876072638365?= X-GMAIL-MSGID: =?utf-8?q?1762963876072638365?= Function ext4_issue_discard need count in cluster. Pass count_clusters instead of count to fix the mismatch. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 2bbfded78093..eac91b2e3aa3 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -6029,8 +6029,8 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, * them with group lock_held */ if (test_opt(sb, DISCARD)) { - err = ext4_issue_discard(sb, block_group, bit, count, - NULL); + err = ext4_issue_discard(sb, block_group, bit, + count_clusters, NULL); if (err && err != -EOPNOTSUPP) ext4_msg(sb, KERN_WARNING, "discard request in" " group:%u block:%d count:%lu failed"