Commit 5bb9c111 authored by Yangtao Li's avatar Yangtao Li Committed by Jaegeuk Kim
Browse files

f2fs: convert to MAX_SBI_FLAG instead of 32 in stat_show() 



BIW reduce the s_flag array size and make s_flag constant.

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 6797ebc4

fs/f2fs/debug.c

+18 −18
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static void update_mem_info(struct f2fs_sb_info *sbi) 
#endif

}



static char *s_flag[] = {

static const char *s_flag[MAX_SBI_FLAG] = {

	[SBI_IS_DIRTY]		= "fs_dirty",

	[SBI_IS_CLOSE]		= "closing",

	[SBI_NEED_FSCK]		= "need_fsck",
@@ -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] ",

fs/f2fs/f2fs.h

+5 −1
Original line number Diff line number Diff line
@@ -1274,7 +1274,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 */
@@ -1291,6 +1294,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 {