From patchwork Thu Apr 6 15:04:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 80320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1111261vqo; Thu, 6 Apr 2023 08:26:25 -0700 (PDT) X-Google-Smtp-Source: AKy350ZP0fUDgrjrgVp2J6TLbXqMHUQuthD99d5C3OKh7TWcmDpXrtr/h4zBtdgd1Ikf6h4B+9c/ X-Received: by 2002:aa7:d292:0:b0:501:c547:2135 with SMTP id w18-20020aa7d292000000b00501c5472135mr5379646edq.36.1680794784783; Thu, 06 Apr 2023 08:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680794784; cv=none; d=google.com; s=arc-20160816; b=HKVqKK1XzmYikSDA80KFZsd9S6RZpoSvQaLm8ypXRvjUz2XlqxoVOaWspg4Lx62Ul2 4PRY2sTfFDAg459+bLB5Us0z5b0l1IKHXA868H1iv0rwFqp6W4Y2DiXYF4sR2RkolgL5 8uE2T5CI54JJzXxTH92t9IEHyPUU5VJW648hc8KSjAjYPfHnCqRlS7eTQdXOpLlg7uux 5fL9BqDv2FaaFW3DFbHNzUtJ1u6TY8GNW2NCkEWsryigssrHYaqMmRMHPJfVe4qPQlml dy31Of/fCH1B6jGzxctOvwVu39R0SjxYqiL/KDazTy0TbNHa9iEJlmDPVfTwJ6c/Y21K SmXA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=jtU8EoT7EpJB9XU8bp7gjC2nFnxrET/WIeW+7XkaIGc=; b=waddv1GHLFjVawSavkOezmliVWwLuSgglF+O+52yYr5Wfb8e5qsZe5XJ02cJgHN24n MEdQ2m3bB7qsQBzK0UNZ60pCBr/lJlhfENkr0CuzvzYDvW3tRHjt0zfeVQFbCGyLzzuC MLyOV8BBjbhHBbGtJVNKO7V9Nh+evInfXjqy+t1REkRj0bsB+HBCISokCz42zLStsxvE aIhS4RPbr4UciOYN2ezEzwPhfOSjMvT1A/2eYWwfdzN/6IRC3/tGipgJXRuZ33aLtoBH brf5rlI+GAXUokqZILO1Ydk0/hqXICPTP6tFgGhrbx2dnZKfoT5Z/NEfYrhz3+YQHrAE NbZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oCiIggbX; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y24-20020aa7d518000000b00502a9229b00si1370943edq.457.2023.04.06.08.26.00; Thu, 06 Apr 2023 08:26:24 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oCiIggbX; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239680AbjDFPFh (ORCPT + 99 others); Thu, 6 Apr 2023 11:05:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239429AbjDFPF0 (ORCPT ); Thu, 6 Apr 2023 11:05:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51919619F; Thu, 6 Apr 2023 08:05:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E004960EAE; Thu, 6 Apr 2023 15:05:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F340EC433D2; Thu, 6 Apr 2023 15:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680793517; bh=4XTqoOIzV1pxO6uiQBLvYXY23I2rTr+JdRE8YKQSOtw=; h=From:To:Cc:Subject:Date:From; b=oCiIggbXe3BgCKtrTHBwVF+8Hja3/ccC2vEhQsEal9BJRvZhGbwurz76UG6+dU+4/ YHVTSseZitltDrfhBrE1vCsH+wrlB/GCrtOzz1NH7zd7VoTYmPC9F5xzc4VscpeDBc ncvRPXWn31GnWvyZo/TXSSRjYHxLV3BALR0LR3kX4Haz9MAsoF8KniOn2SAQI2w1QS 2ZwvDNAqDE5gnEAamGuA6v9ebBMcQ4ZfzubKNAVXYLGYPaHbJNIqdmJJmE6HOojhZh MEQTDVMF2eRt713mKxqok4l/eIJHSVGenCoZg79J0fF6rDiREFKQVVhVHebPxSUUa7 hrwZ1fHaV4p7g== From: Chao Yu To: Theodore Ts'o , Andreas Dilger Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v2] ext4: fix to report fstrim.minlen back to userspace Date: Thu, 6 Apr 2023 23:04:10 +0800 Message-Id: <20230406150410.3853001-1-chao@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-5.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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?1762441071870801752?= X-GMAIL-MSGID: =?utf-8?q?1762441071870801752?= Quoted from manual of fstrim(8): "-m, --minimum minimum-size ..., if it's smaller than the device's minimum, and report that (fstrim_range.minlen) back to userspace." So this patch tries to report adjusted fstrim_range.minlen back to userspace via FITRIM interface, if the value is smaller than device's minimum discard granularity. Signed-off-by: Chao Yu Reviewed-by: Jan Kara --- v2: - fix the wrong calculation of range->minlen. fs/ext4/mballoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d8b9d6a83d1e..4af51a16fc64 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -6491,6 +6491,10 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range) discard_granularity >> sb->s_blocksize_bits); if (minlen > EXT4_CLUSTERS_PER_GROUP(sb)) goto out; + + /* Report adjusted minlen back to userspace */ + range->minlen = EXT4_C2B(EXT4_SB(sb), minlen) << + sb->s_blocksize_bits; } if (end >= max_blks - 1) { end = max_blks - 1;