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: convert to use MIN_DISCARD_GRANULARITY macro
Date:   Sat, 17 Dec 2022 13:24:48 +0800
Message-Id: <20221217052448.60656-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?+Y/zkNWB78PROaO2MGMqzXrVdQy/fqZVJZkbeVZcVfhPFcr5wINm9Rl002+w?=
 =?us-ascii?Q?Yxyk0H+yOTsioeSp3smp07g/NVcNuLSEKfFlHTMsDyNSu0rpOYRyW1/sPIJs?=
 =?us-ascii?Q?LRAHVUjYA6mkNxfYqR4rNMkU+tKO2ROIha8LXJnAyrfoE/i/o/yHsUvFK1FB?=
 =?us-ascii?Q?QqVc1kDgB/6jym+FYuKoS8i7ybuDQTOdc2gvTtwx83lL4NOKbcK4pAt9sfkD?=
 =?us-ascii?Q?CQZQ+sBmmTFkM0xgL5/Xhtl2RgdokyIQPAfHwkbqGtI2y097j/gH0fi3dmW0?=
 =?us-ascii?Q?E77Mo8TJrE0enhMiMmD1zLAxoHog0Jr+2z9vPeTUMrjb9m9RwsWu0qOKatO3?=
 =?us-ascii?Q?vTfe3e3lN78gmDTW2RigziUL3sd8+76Q9rjDwKvFI2pmCWRnm0RyEwErTHze?=
 =?us-ascii?Q?Z81kcZIWPsY1EmvWfbmbU9Aub1M29PD/5I0FjMMMOXt6fipM/o77s4XBBCRP?=
 =?us-ascii?Q?inNRkKrZN+BP0zYSPDPVMm3Buu0FQhq6E3XZ0jTAKVWZWTRSwKdHeF6kOaMG?=
 =?us-ascii?Q?lMEvqrsYwOqyhn8cSqck3208ppOG7TfgKBFqhxiWtSTP6x/kSydQYa+LImMS?=
 =?us-ascii?Q?fhPEXFwW+yVPGVGVP9ij7Wc3oY7YKQwX0lTXcJeFBvv5/0lmnsv9pM/f24Tu?=
 =?us-ascii?Q?KImSW0aZe+FXuHcbaTKc2APzmGHomYhhjbyUM9jOfHvkpFPwTRixoRMJhlnt?=
 =?us-ascii?Q?BgiTW1e4gwFr7W+vRu1YsW9zw2DvxTTiiwSoyuOefta4Fw7ZX2SG4ODK30m6?=
 =?us-ascii?Q?JRh7W6Inz7F0SPtwfmoTciAo9Md6iNDZzcmfbPZunyAqnLccPVrPa8qx7Lp4?=
 =?us-ascii?Q?rReSzhARm8mzHHj7spE9siMJI1fRXsW/00NtASoTllOaYlp0svd8wXWeMlyr?=
 =?us-ascii?Q?B95eB6otUfUokuBGwtV5FlCKfZgtjxHrRtNEV4xYOa/iK1hovSmSY9feQl3v?=
 =?us-ascii?Q?CPu/no24v61cmq1uVg5a29RYoloJkgAms3VKiABtpRqgvLu2DIE1oQCq4OuC?=
 =?us-ascii?Q?Ih8ETw3sncBe0mSUKsaPFTQJME2L0/RjrzWK51NSIov8V598RdNakS39kMXm?=
 =?us-ascii?Q?qsv+EZKUtPbTHxNsoySpvVZYf4WFxycA1XuuWANWww0YMjyTRrbIXdHvYRaa?=
 =?us-ascii?Q?6ixYLEp5F3i0BXqgoZMrP/WlKBO0eU61sf683n7iiMW9MBBz1QX8hWpIqts7?=
 =?us-ascii?Q?dEA3zs3PsS1WThQDDTWn5ZBFnuqd1Dw71SQ0pqWmOVoZTGKo1AQlfMarc4vb?=
 =?us-ascii?Q?biTAMoBZzLuXtPM/OvQXfzfgnxui2LD5x2WjhMlGxbHdh7fqqD5MRk9HmT88?=
 =?us-ascii?Q?b7zNDaQtKJ+8Ae+OM5ASZOQiYFbgUdVCs3/C5PvrjuGobwGg80K9STMYuTvd?=
 =?us-ascii?Q?gW5gBtcrT4Kj3gwShnixN+CyG1wY/KQNeJwm8gFc/N5sSeQXURe/NhteR8jm?=
 =?us-ascii?Q?GcVcUC3nF3YLtaRBhm/0+0vcESo2Sqg3j+lC87u3gdEgAEzHrMKAEPuqO7k4?=
 =?us-ascii?Q?we57Yvr4s+q+tfp06slY+Msh7zaeNSv9uhAjiIbnu5LPXObbC7pefPXPwDfN?=
 =?us-ascii?Q?HOAL/3j7XAUueW2/EGCNTMAenldR9qoMi/zIZfwj?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c78f4f27-c803-42f5-08fb-08dadfef0a5b
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2022 05:24:59.1356
 (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: NpFgpb+DuNC1uVBmPKKBspQ9Ul6CUWgpQ7E249UcqOoacTl4QD1hcwhZgumcOxrUpUDMKHTlbkBwVR+agpOYpA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB6195
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

Commit 1cd2e6d54435 ("f2fs: define MIN_DISCARD_GRANULARITY macro")
introduce it, let's convert to use MIN_DISCARD_GRANULARITY macro.

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

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 25ddea478fc1..c95a9683f950 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1610,9 +1610,9 @@ static unsigned int __wait_all_discard_cmd(struct f2fs_sb_info *sbi,
 		return __wait_discard_cmd_range(sbi, dpolicy, 0, UINT_MAX);
 
 	/* wait all */
-	__init_discard_policy(sbi, &dp, DPOLICY_FSTRIM, 1);
+	__init_discard_policy(sbi, &dp, DPOLICY_FSTRIM, MIN_DISCARD_GRANULARITY);
 	discard_blks = __wait_discard_cmd_range(sbi, &dp, 0, UINT_MAX);
-	__init_discard_policy(sbi, &dp, DPOLICY_UMOUNT, 1);
+	__init_discard_policy(sbi, &dp, DPOLICY_UMOUNT, MIN_DISCARD_GRANULARITY);
 	discard_blks += __wait_discard_cmd_range(sbi, &dp, 0, UINT_MAX);
 
 	return discard_blks;
@@ -1695,7 +1695,8 @@ static int issue_discard_thread(void *data)
 
 		if (sbi->gc_mode == GC_URGENT_HIGH ||
 			!f2fs_available_free_memory(sbi, DISCARD_CACHE))
-			__init_discard_policy(sbi, &dpolicy, DPOLICY_FORCE, 1);
+			__init_discard_policy(sbi, &dpolicy, DPOLICY_FORCE,
+						MIN_DISCARD_GRANULARITY);
 		else
 			__init_discard_policy(sbi, &dpolicy, DPOLICY_BG,
 						dcc->discard_granularity);
-- 
2.25.1