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: define DEFAULT_SMALL_VOLUME_DISCARD_GRANULARITY macro
Date:   Sat, 19 Nov 2022 02:02:08 +0800
Message-Id: <20221118180208.66578-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?IusM55oqNTBedPc6BOymERWlxuQeVZfl8DhODVbMket6gvrBwY0IuWK9cpK/?=
 =?us-ascii?Q?FavP33yay0PRLgXhnDt2Y6TJbWEGFGxZXHr8VXS4wDBunf+aUW6THOghvzBe?=
 =?us-ascii?Q?22mZWbtxRRMsJrdws9Vl7bu7s4w5BNJ4V/QT/cqXupMIamT1soBWg/nEpoKA?=
 =?us-ascii?Q?9fM6hU7d96ogfXf4XpCSyE7ClYKF66BwHLoW215pTbm9nhC+pSuebH3cOyTb?=
 =?us-ascii?Q?JDk0gwRtJNKvCx8NFDCT35H1W4xmqFIExW6RFk50f1bGAjaZ9hW2hdB/Qh85?=
 =?us-ascii?Q?kWLNL/76N0adGHAcBDROIuFrcYuw6F29nW2/h3dfbbXEItoTgn+mXz/AEvX3?=
 =?us-ascii?Q?p79vp9MIRc/YOTjom1M2KuCFbMbUuBTjpLg0wBO+++C2viz7UptslO+bPcr6?=
 =?us-ascii?Q?YvNUDbtXRHNUEbFnFcAgRF2mGKnqYeWq8/VYAW31YEaMMN4s+OmlzwpxSqX1?=
 =?us-ascii?Q?dLNYv/0nDSSWFAnWjmJQc4DdvONLMR82KC+ExS5VNsS9Z+gdJ2I+04yNC8ap?=
 =?us-ascii?Q?UG55I4nd67bdnK13lQ3fenYUmPQumhd06N9w+Or8uOB15nbgBYig7SBZM7e8?=
 =?us-ascii?Q?/em85thkFbhsbkdh1pMCgD0GnNUS0T/99dIx+C0PhUmvdol6LAQrvr7jljSg?=
 =?us-ascii?Q?OJWglaYyyhegBYfSEmFXfSdAXmgJtUIw54C0GEV0bnTNaNZgLzyRAio7yHU8?=
 =?us-ascii?Q?hEO7bagIEg2IoKTgXeI+8HbFxdn/axuG0GDeulB/4jCCR8kob+JD5LVoOnuc?=
 =?us-ascii?Q?dhx+8uBSrgh/IFv+r2i3cxYcHFqKIiebrZXSyYCljT3VYqlbzobqf5YcV7PI?=
 =?us-ascii?Q?fcwo0Pl96PGrDETWwRaSA20fWoAFL3PX22hjnzo8xJf4QlaNGVVA9Ca+vxoy?=
 =?us-ascii?Q?uZmpU1Q9CPi1zCWgc+WfHTPwHOrC7+f8smrjBFv+pi/M7pMl6Jh/eyH4c5Ph?=
 =?us-ascii?Q?S3JIE0HxKsqWvXsNXeBw37UclhmtBPl70NHVXHqavWzhfSGqRwXzjlAUBkRx?=
 =?us-ascii?Q?1EobgGviMRG3hH4g1iolhonF/DL383AngIW40oeoEJZyAJ3HcoD5KfREKmpK?=
 =?us-ascii?Q?CvzYzksymrFgp2zImQWNuM54oNpv6PksPi1ZXhMrlbJ+zEKB1eebCX5W2Jep?=
 =?us-ascii?Q?43nh7G5KtUUsha2/0XhdWPI5vKb6QQZwAnqJ2qWznsiE59eUE3JFV9T9Hj06?=
 =?us-ascii?Q?tvXEG6HkgoEu8e2usyv4Db4zyqbf/cNrey/qfhxoKG416mzvpiHch51owfYW?=
 =?us-ascii?Q?bvxqhHVbafSNFUM/mTa5Pfa5/uF8ryb1A/+4coEJLhgYS96eq0TuV7102Duq?=
 =?us-ascii?Q?U5+Y8QYZPj/PEB/060UFvL9ECvTMOt8Y8AfAOsXVdjNdGRVAmDljN4pReooj?=
 =?us-ascii?Q?IYMoPeb+aNANKSzJqlQIDiMxH2B/n657SMdzPWgBt8Z8N23XCtGC5Ig574Rs?=
 =?us-ascii?Q?g0pEsJsI8lPEJ1BP5troesxjoZsucLX3BPYDKUGHmqkrJa+mMLRGacXnk1ou?=
 =?us-ascii?Q?Q7uAW1pz0iyPNbGkO42JtfQERvzhBCZ/LslS3DDfgzi4CjGwwGe1RYUp5eCw?=
 =?us-ascii?Q?zYf7NS6z52YU58JLKJUH4iE1sKruFAu476io/EQq?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 113b5765-ab96-45aa-e10d-08dac98f09cf
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2022 18:02:20.9721
 (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: FyeXmSx3dmvyD795ZbmiF8c/pKBN3hez0R0UeSrLVLQoTbTNNCCyfq66CbpjI8sabRcPqogiCWr+wat45ywmVQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5419
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

Do cleanup in f2fs_tuning_parameters(), let's use macro
instead of number.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/f2fs.h  | 2 ++
 fs/f2fs/super.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index f0833638f59e..86c651884d26 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -329,6 +329,8 @@ struct discard_entry {
 	unsigned char discard_map[SIT_VBLOCK_MAP_SIZE];	/* segment discard bitmap */
 };
 
+/* default discard granularity for small device, unit: block count */
+#define DEFAULT_SMALL_VOLUME_DISCARD_GRANULARITY 1
 /* default discard granularity of inner discard thread, unit: block count */
 #define DEFAULT_DISCARD_GRANULARITY		16
 /* default maximum discard granularity of ordered discard, unit: block count */
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 31435c8645c8..7c32eabcf50c 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4080,7 +4080,7 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)
 	/* adjust parameters according to the volume size */
 	if (MAIN_SEGS(sbi) <= SMALL_VOLUME_SEGMENTS) {
 		if (f2fs_block_unit_discard(sbi))
-			SM_I(sbi)->dcc_info->discard_granularity = 1;
+			SM_I(sbi)->dcc_info->discard_granularity = DEFAULT_SMALL_VOLUME_DISCARD_GRANULARITY;
 		SM_I(sbi)->ipu_policy = 1 << F2FS_IPU_FORCE |
 					1 << F2FS_IPU_HONOR_OPU_WRITE;
 	}
-- 
2.25.1