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;
From:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH] f2fs: fix to show discard_unit mount opt
Date:   Mon, 16 Jan 2023 22:12:28 +0800
Message-Id: <20230116141228.43239-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GbHQpTlKIi6i9ni7auhBn2cOk6tw5YmoftKJg6ac0ctGaZiPNaEJ5Y4FW3M7?=
 =?us-ascii?Q?EIaEduXH0Ga2EHS/8fbQZX7BNeJq9z/qx+v5KcERAx447hlVKOVKTtKyOd6J?=
 =?us-ascii?Q?5YdjZALA4M47x0Ab2QSTY6u6mG2kiHD+CZty25hyw80krFf0+CRQhz2+YyfB?=
 =?us-ascii?Q?sl1ULPsZkHp1H659UXpdplRMc9lesVDIOI7mB4FqcRDPf8aYYxOedkp0PcVn?=
 =?us-ascii?Q?lQLGO1FhvHpUENBC5LJMPbk31Heb0VkmW/VOY0gNNV0KmuSoj/ypWBLa1XCl?=
 =?us-ascii?Q?0fV3/o0rJy4immTRibCHSVEzyHwLEE+GFaqYLZFKArewkfWdzR2FApcxVFdv?=
 =?us-ascii?Q?zPqOrJh47oCfkxnMSlH/6y/pHfjVez+aylKtVDxbS80MwHkC2gZNyI+9SeHc?=
 =?us-ascii?Q?nLq2JLQc88aTaFq41NUXZ1+b9zWtbNgYs/yFnSt5+6tXP0XgQt1ToctddPHG?=
 =?us-ascii?Q?ooovPgZmVswegLoCs8MNNrEg0NQgGNJirwy4TzQHGs/KXbrfklUxilmG+R4n?=
 =?us-ascii?Q?IDFxr0Xts+6lpLZr/xRA/fun4Qzi2uAAWXKJe5PZjrAFBX275lexEUbkHIo0?=
 =?us-ascii?Q?3r1/ZN06yWCmFJZk1u7I4HfAigJPPSXHFVG2L6hA4udRZXuRyMWWKM+o9W8U?=
 =?us-ascii?Q?RHqiWgKtQn0dhOONpbOlZErwD5vBu75rgj3Q23cJEL8TR4aWtRW6c2rhDZbA?=
 =?us-ascii?Q?B3RGuhHVPY5W9zIodRXRxzsDtWJruAWWyRI4Tv0hdP9Z4fSNuo9jeUEHdQqg?=
 =?us-ascii?Q?LCECZMdAdSpzcFDLIIfTs8CGUPbFeL539Kori69lf3tAK9htpXLMwaeQIIi9?=
 =?us-ascii?Q?o9Zox7XZXMTWsTpOW2CEKnFBagdkIk8nzr+GTdRjnsfkrLAn9skLjQvavaW5?=
 =?us-ascii?Q?ERXQvlgxMmmTHpG1o7b9HYZuluQqH7GywhswfUO0anYbjw6eWBM1irQXZ5Fu?=
 =?us-ascii?Q?3asL554GNy5xP7vXNEHO0fi8oq1s21Ilcz6aSt4J/WKXY9aAObS05+olktmb?=
 =?us-ascii?Q?meZYxoNWm513e11WfQBxWrR3JVoj4sRt9xw3qAbhWpET6xSFLvgCEzuPxSvp?=
 =?us-ascii?Q?Xw5xskxWHiqIyajfToR3bv9u1A3lFfgqJNxgIwGcNG9XyX5UXOJCOolR2ELY?=
 =?us-ascii?Q?kFTBWHa8lf1WJAP0Z3lG63S9wfgjXxW5zBw0nSeKNPksI6540ld5giDuMgUr?=
 =?us-ascii?Q?LqcSA0DEuCgGYLkAoikI6LWsl9Vp/x/Ktid+fNH7LckpQCfLoL7Hk3TwuZDF?=
 =?us-ascii?Q?LcrokbuOjfb9vfOFSVGJ/6WT3w9c5dzguYVImNN8EPAvvgIShJriXaBS4nx2?=
 =?us-ascii?Q?9C/I/x+ar0ywDY2m7Xz/tUSJ16WdasqfVpGYazx2UoiOEBs/vR+7lzR7C90n?=
 =?us-ascii?Q?I50yvPTK0W6+NYjhPc+UpXwNgtPe9XzLIDfcsxEstJehviEJ1dQMTR4+rLim?=
 =?us-ascii?Q?slLTwXYuPtNQBqaAF8C4LyCkpdw+MJwnyhc8a516qEWY20v3Xc7QTxXRN5rI?=
 =?us-ascii?Q?ccTRochS2RnbSCYu0jrrxDKuDTjEPPzbDw0m55XHX8hs6MGHRo+VMTWW9Hak?=
 =?us-ascii?Q?g+Ds1xya3dQPh6U9XUZJYabh9oZ+dIzWYx0ngba7?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e91521c3-511b-46ee-227a-08daf7cbb84b
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2023 14:12:36.9949
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JW7MZFBHjYMG8Yg49zSsEso2ixOgfmcqY7oF/+YBUqnF5V63I5WzKpJ7OBvSZ+7GhC3YOPwyaIiDo5uY4ArxWg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4457
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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

Convert to show discard_unit only when has DISCARD opt.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/super.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 5fc83771042d..ab8a77ffc1f4 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1908,10 +1908,17 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
 		seq_puts(seq, ",disable_roll_forward");
 	if (test_opt(sbi, NORECOVERY))
 		seq_puts(seq, ",norecovery");
-	if (test_opt(sbi, DISCARD))
+	if (test_opt(sbi, DISCARD)) {
 		seq_puts(seq, ",discard");
-	else
+		if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_BLOCK)
+			seq_printf(seq, ",discard_unit=%s", "block");
+		else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT)
+			seq_printf(seq, ",discard_unit=%s", "segment");
+		else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SECTION)
+			seq_printf(seq, ",discard_unit=%s", "section");
+	} else {
 		seq_puts(seq, ",nodiscard");
+	}
 	if (test_opt(sbi, NOHEAP))
 		seq_puts(seq, ",no_heap");
 	else
@@ -2035,13 +2042,6 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
 	if (test_opt(sbi, ATGC))
 		seq_puts(seq, ",atgc");
 
-	if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_BLOCK)
-		seq_printf(seq, ",discard_unit=%s", "block");
-	else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT)
-		seq_printf(seq, ",discard_unit=%s", "segment");
-	else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SECTION)
-		seq_printf(seq, ",discard_unit=%s", "section");
-
 	if (F2FS_OPTION(sbi).memory_mode == MEMORY_MODE_NORMAL)
 		seq_printf(seq, ",memory=%s", "normal");
 	else if (F2FS_OPTION(sbi).memory_mode == MEMORY_MODE_LOW)
-- 
2.25.1