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 v2] f2fs: convert to MAX_SBI_FLAG instead of 32 in stat_show()
Date:   Wed,  8 Mar 2023 22:06:23 +0800
Message-Id: <20230308140623.35942-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?pVsuDP3dbByLpOkksbTQNGiuWmzc4uO6ZUKs8+JYWbvuNlSv+qiLvKV7mScl?=
 =?us-ascii?Q?j8KlEhAS91ZOJMtozIUoNhxa6k5WwaeiZ0q4jN0hBZgWUyqzKLJM+Ln5EThJ?=
 =?us-ascii?Q?561JK1bDVQeYqsbAD0xVSaO7AwcUnmdT6je//dAl2x3xSyabUkIhAHScqgYa?=
 =?us-ascii?Q?v6yXdhETseMnZvhTM/2dEXpqKlifBD8E+UfkR0NnDQRyjed2Wnv2TJVnMLQo?=
 =?us-ascii?Q?VQVK7dUsqaC4uJssqvzMBfnTrRlRQeM8lSsquoJWDikAEWTTYqp2CHo5YmBe?=
 =?us-ascii?Q?Efgc4lF7wFyg+gmGV7Zin3o5JFYXNyuVbDfY3oahF1P+askMyldm0uw5JG/m?=
 =?us-ascii?Q?0mAGQdCeNodLs+kA4F2l+g6tckpaqoahwTfkVtvGrU3cobdKeJDT3dCIzrrY?=
 =?us-ascii?Q?PlEjyJ3uk5NzxA36Id4f+2XR9NA2v5xeu0pKZWrnRQw9Si1D0VQUzgEvQNZW?=
 =?us-ascii?Q?Qdj9xM9mqmVOfipNVcxh3+lMpcC5AsYw6VKz7BFXScmM/uRveIsJTECXNJkM?=
 =?us-ascii?Q?7rPkzQsqQD+0WaR7c/OVxEXp8/tAya3mWibSK3550q32GZfg14zw9QegMkJV?=
 =?us-ascii?Q?vTAKLOkEmDgqCdQCo/JamPcH08fkk0zTUQwYMFyF/8LlW/iz2bcf7+g8de+r?=
 =?us-ascii?Q?idjqic4RKB8eDMe/RKBeOmLKlElf4V6DmuOIq2YaZFPV+oBIshqnGkoX43MC?=
 =?us-ascii?Q?+iKR0oTuNpuI9wss5Me8SrIFXoxsp3ZBO4kyaoDsxlmcSWYEDWXFH1NSalVU?=
 =?us-ascii?Q?K+ify9PzC4mUMOWAzixkJqr1B+HbLpme/MZqV0ekYo2Wkt0ckugm8fSgFOHG?=
 =?us-ascii?Q?TA45k+vjZi8GBEIrNSgD88hAQ1SALBFS1ReXkY6oz0+Jvrb3lLgR1/ZSGHAF?=
 =?us-ascii?Q?LtuJ8LLhbTOWbIp7+9aqK/RfrYDesbGc3ONiGtz0tJffWr+d/4V/p9nQuOyE?=
 =?us-ascii?Q?dPxDDSQ7qj5Iz2qjzgWqihtiZS0Y5yNrXUjx6wJeOL/DhWpcgfSm0j3uqKhF?=
 =?us-ascii?Q?EyTqJWT4eqI4ZO25MkmVd4oScDyKWpONejfpg6gxJO/gZf9qYiZrlt6NZMSX?=
 =?us-ascii?Q?J9JHSzKAqmwQq+Xh22Oaxzkc1rpkbkW90/Je8DwpwL5tiXNcHx584KtCTWHm?=
 =?us-ascii?Q?zjj1qBny/iV3DsIHMeGUB8r1Hm7uf9KwOYJv3THpecIpS5Wvi2UT7OVouGjZ?=
 =?us-ascii?Q?/murTFiGT4/a0VECZWv5nj+XXZ4NOQy54iXxWe3nTO1x39HaD+VevZNhc9Xu?=
 =?us-ascii?Q?0XRv+sSTeHZVdoV+F0bVuR3P0Lz86PjlAKjB/PsIsIHHDE3WQ9UdsUJ99OGV?=
 =?us-ascii?Q?8DzFkiF882Cdckr84m1UGozC2wGoEmX65aFyR2CmnYp2GDXUwA5Vvx/X3VZe?=
 =?us-ascii?Q?fxuOaEVYqAU0iesUiZwdj3QMcsPg9iQ2qo4+6/m+7sulAM5u5+TR5RAyRaVY?=
 =?us-ascii?Q?F45AgJQyAANau1bQi89U30ZzpcT+y4HOGU/7rW0NHe8fKy6xUZ3ZQkICVVVg?=
 =?us-ascii?Q?6Q6vdJyO1LVhf7qjWa95RZTQbOkjc6ZqxmvuhRHsQFQiwROzrYBcLcB1Cr2L?=
 =?us-ascii?Q?jVtfypXVEnJOEivT7UqGf/7ljiotSDPI10bo0ZTR?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b97905e0-4d9a-4a0f-e881-08db1fde542e
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 14:06:36.0348
 (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: AFAwxJx530YHdpJXLiInqIYl0jSzRvarWlBXjG0DZCFR1DHT0dlS3SmA35KQXFTWxCyZmxhnxZ/iim/AbhWpHA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4138
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

BIW reduce the s_flag array size and make s_flag constant.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
v2:
-make s_flag constant
 fs/f2fs/debug.c | 36 ++++++++++++++++++------------------
 fs/f2fs/f2fs.h  |  6 +++++-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 30a77936e3c5..99c7fc832ec7 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -336,22 +336,22 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
 #endif
 }
 
-static char *s_flag[] = {
-	[SBI_IS_DIRTY]		= " fs_dirty",
-	[SBI_IS_CLOSE]		= " closing",
-	[SBI_NEED_FSCK]		= " need_fsck",
-	[SBI_POR_DOING]		= " recovering",
-	[SBI_NEED_SB_WRITE]	= " sb_dirty",
-	[SBI_NEED_CP]		= " need_cp",
-	[SBI_IS_SHUTDOWN]	= " shutdown",
-	[SBI_IS_RECOVERED]	= " recovered",
-	[SBI_CP_DISABLED]	= " cp_disabled",
-	[SBI_CP_DISABLED_QUICK]	= " cp_disabled_quick",
-	[SBI_QUOTA_NEED_FLUSH]	= " quota_need_flush",
-	[SBI_QUOTA_SKIP_FLUSH]	= " quota_skip_flush",
-	[SBI_QUOTA_NEED_REPAIR]	= " quota_need_repair",
-	[SBI_IS_RESIZEFS]	= " resizefs",
-	[SBI_IS_FREEZING]	= " freezefs",
+static const char *s_flag[MAX_SBI_FLAG] = {
+	[SBI_IS_DIRTY]		= "fs_dirty",
+	[SBI_IS_CLOSE]		= "closing",
+	[SBI_NEED_FSCK]		= "need_fsck",
+	[SBI_POR_DOING]		= "recovering",
+	[SBI_NEED_SB_WRITE]	= "sb_dirty",
+	[SBI_NEED_CP]		= "need_cp",
+	[SBI_IS_SHUTDOWN]	= "shutdown",
+	[SBI_IS_RECOVERED]	= "recovered",
+	[SBI_CP_DISABLED]	= "cp_disabled",
+	[SBI_CP_DISABLED_QUICK]	= "cp_disabled_quick",
+	[SBI_QUOTA_NEED_FLUSH]	= "quota_need_flush",
+	[SBI_QUOTA_SKIP_FLUSH]	= "quota_skip_flush",
+	[SBI_QUOTA_NEED_REPAIR]	= "quota_need_repair",
+	[SBI_IS_RESIZEFS]	= "resizefs",
+	[SBI_IS_FREEZING]	= "freezefs",
 };
 
 static const char *ipu_mode_names[F2FS_IPU_MAX] = {
@@ -384,8 +384,8 @@ static int stat_show(struct seq_file *s, void *v)
 			"Disabled" : (f2fs_cp_error(sbi) ? "Error" : "Good"));
 		if (sbi->s_flag) {
 			seq_puts(s, "[SBI:");
-			for_each_set_bit(j, &sbi->s_flag, 32)
-				seq_puts(s, s_flag[j]);
+			for_each_set_bit(j, &sbi->s_flag, MAX_SBI_FLAG)
+				seq_printf(s, " %s", s_flag[j]);
 			seq_puts(s, "]\n");
 		}
 		seq_printf(s, "[SB: 1] [CP: 2] [SIT: %d] [NAT: %d] ",
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 199b1ca6b9e4..407cb35ac06f 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1293,7 +1293,10 @@ struct f2fs_gc_control {
 	unsigned int nr_free_secs;	/* # of free sections to do GC */
 };
 
-/* For s_flag in struct f2fs_sb_info */
+/*
+ * For s_flag in struct f2fs_sb_info
+ * Modification on enum should be synchronized with s_flag array
+ */
 enum {
 	SBI_IS_DIRTY,				/* dirty flag for checkpoint */
 	SBI_IS_CLOSE,				/* specify unmounting */
@@ -1310,6 +1313,7 @@ enum {
 	SBI_QUOTA_NEED_REPAIR,			/* quota file may be corrupted */
 	SBI_IS_RESIZEFS,			/* resizefs is in process */
 	SBI_IS_FREEZING,			/* freezefs is in process */
+	MAX_SBI_FLAG,
 };
 
 enum {
-- 
2.25.1