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: judge whether discard_unit is section only when have CONFIG_BLK_DEV_ZONED
Date:   Tue, 29 Nov 2022 20:29:28 +0800
Message-Id: <20221129122928.23730-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?1JWPWQGBW5Yraj/rOFk5ak0ifwtgcTCJxbnvvNpv/dM0EQiPQSJN4mk3a64n?=
 =?us-ascii?Q?t3L6ecMDCqNDbxR8FTx87VoEZLnsUFDQC+A/WlNG6PMm3wFewI6VuKJC/PkG?=
 =?us-ascii?Q?Gv+84CpFE/XS0sGkICAVUrBy7hmpYazDsyWtsvsSvlQ5tK1dFWU2RF5ncqIj?=
 =?us-ascii?Q?VgiPugLh2faeEBNLEfIpmKt/IzBtW7W5tLv59W9EtNoUhHe3WPWSkPf4F7AQ?=
 =?us-ascii?Q?kttIOUSp9rHNWAOAywrPJGD2Zrjrq7TcFUGL73UFOI2cwcWg/LYSNAbB+5l8?=
 =?us-ascii?Q?tfZ6AB9Fgc9x+ffDNMwoE1kkOvD7sO6mH73wU+tZ3I0hNKm5AT7xHzVdnCx1?=
 =?us-ascii?Q?CtM7LJvktB72p/lJrqgvmCNDTKeO3KHv5IvQlCaxkaDEa3SQhKcyBMXtQGON?=
 =?us-ascii?Q?aBkYhoPab5ZZtMWZYp4PcPhSXhu4HBE5jQNbSUdoSAkix1KihxUffjolDFmu?=
 =?us-ascii?Q?p/+3w5jsROMuVsJNEKglpEKh5DVlWfJ7C6KL/gaZSx2xyvCmULB2vmhLFmSd?=
 =?us-ascii?Q?SgW56p4OI0Z7SG1IgwcupR1mZQEPCqhOCl55NAuzaHc87xLTwV9/0ej5gbYK?=
 =?us-ascii?Q?vejXHyMT1ZiezLrAtcO9y3uVVkQKn6/T60HjN0OWsXtW+yEpoH3sdr01KinQ?=
 =?us-ascii?Q?+dIW4ur1fuyLZeHdxEf26XcsTVkOK50c50/ApcexOJJMkYV3jl6Bh7VrRtyu?=
 =?us-ascii?Q?Xwp/OUzNYljh5EOV5tJjGd+igDsS75jeY/u8xJl74fgi+1DO8z5WWF86Trz2?=
 =?us-ascii?Q?35hMvKToAPZi52PV3ekdcgTZbbm8vy/F2BDszXq/6wC0BOt7E4fNGFmfr68k?=
 =?us-ascii?Q?55xsrVaWd10xzX2dzBTGEdCVYjlDQYwvrBzyAGSfnvT4OdUBypE4lF4Bf9Sc?=
 =?us-ascii?Q?jnFq+NPyO3lH3DKDW3+fpN/uCz8P7OyDGtUIxYdiu0zP4thH53rhcZ86rEEg?=
 =?us-ascii?Q?whmsCueNMmntb1TlQIpjzvg3sEPM8ohxZQ9rWrpfhdSXjmKkCeqkcaNWcTRf?=
 =?us-ascii?Q?DPdIfP7NUGm3toTj5VGJiprOPN/3S3rNxnJ/LcxRej4nEHA+GzwzFkoHRf/k?=
 =?us-ascii?Q?+49SxQBLAp4/SkO7CG/kezuog44BubuSi6nULPixs+Z3pKB8yjS4p10ekaoz?=
 =?us-ascii?Q?xrf6BIKP9FLG38YO0bntkJfFjvG9uA+ZgMWzJL7q7t0hUQglw7IbDFnYbQ5g?=
 =?us-ascii?Q?V5+T9QUCWVIv0cy9FJRWxp1XSIVlfFIbl+nwH38SSZuRukzbrnrV3wgivR38?=
 =?us-ascii?Q?EttFE806EhGI7gBmGxKPqsHGVCUSW1MLVtsykl59GtD2DZ3XYDuC/9SYrPS6?=
 =?us-ascii?Q?mUWO/pY0dKTTWkoLcCMfcyYrhtvLG4oohYy+dkJPeF1epc2BlGP1/PCDG7I0?=
 =?us-ascii?Q?5t3YYvIya51UcQVpkauUz/YZP6XO27mxeulZzHiaGaEf+3e67unvvDG7jIu9?=
 =?us-ascii?Q?RT3+c7TWW7YomdHGKV+6o75giA5jSTcCFQLW6yLKGthjTr/MYewMsm0gXfvO?=
 =?us-ascii?Q?OLO8Lgd1s75iS1DYOSoCRABhULn0a069tbpOzBERGh4blQLbJ89wlp3y4KQm?=
 =?us-ascii?Q?jHnBUJiNVUGUq+UrJWQokBbAl+nmqPAHBRl9859p?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fd576a91-8dcf-4c7b-f604-08dad205629e
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2022 12:29:39.8850
 (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: f/i6Gf8+euPycAUlyr+S9UKMVb32gWpI35H9w7FA3GN4iHX4FQOJ/Zw5QjqHESuQI7VS8+ZNpmG5GWn/NmQ35g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB3907
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

The current logic, regardless of whether CONFIG_BLK_DEV_ZONED
is enabled or not, will judge whether discard_unit is SECTION,
when f2fs_sb_has_blkzoned.

In fact, when CONFIG_BLK_DEV_ZONED is not enabled, this judgment
is a path that will never be accessed. At this time, -EINVAL will
be returned in the parse_options function, accompanied by the
message "Zoned block device support is not enabled".

Let's wrap this discard_unit judgment with CONFIG_BLK_DEV_ZONED.

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

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 79bf1faf4161..753c97be7d39 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1289,19 +1289,18 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 	 * zone alignment optimization. This is optional for host-aware
 	 * devices, but mandatory for host-managed zoned block devices.
 	 */
-#ifndef CONFIG_BLK_DEV_ZONED
-	if (f2fs_sb_has_blkzoned(sbi)) {
-		f2fs_err(sbi, "Zoned block device support is not enabled");
-		return -EINVAL;
-	}
-#endif
 	if (f2fs_sb_has_blkzoned(sbi)) {
+#ifdef CONFIG_BLK_DEV_ZONED
 		if (F2FS_OPTION(sbi).discard_unit !=
 						DISCARD_UNIT_SECTION) {
 			f2fs_info(sbi, "Zoned block device doesn't need small discard, set discard_unit=section by default");
 			F2FS_OPTION(sbi).discard_unit =
 					DISCARD_UNIT_SECTION;
 		}
+#else
+		f2fs_err(sbi, "Zoned block device support is not enabled");
+		return -EINVAL;
+#endif
 	}
 
 #ifdef CONFIG_F2FS_FS_COMPRESSION
-- 
2.25.1