Commit c34110e0 authored by Hongzhen Luo's avatar Hongzhen Luo Committed by Gao Xiang
Browse files

erofs: clean up erofs_show_options() 



Avoid unnecessary #ifdefs and simplify the code a bit.

Signed-off-by: default avatarHongzhen Luo <hongzhen@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240517095652.2282972-1-hongzhen@linux.alibaba.com


Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent 20c02972

fs/erofs/internal.h

+0 −3
Original line number Diff line number Diff line
@@ -64,15 +64,12 @@ enum { 
};



struct erofs_mount_opts {

#ifdef CONFIG_EROFS_FS_ZIP

	/* current strategy of how to use managed cache */

	unsigned char cache_strategy;

	/* strategy of sync decompression (0 - auto, 1 - force on, 2 - force off) */

	unsigned int sync_decompress;



	/* threshold for decompression synchronously */

	unsigned int max_sync_decompress_pages;

#endif

	unsigned int mount_opt;

};

fs/erofs/super.c

+8 −20
Original line number Diff line number Diff line
@@ -943,26 +943,14 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root) 
	struct erofs_sb_info *sbi = EROFS_SB(root->d_sb);

	struct erofs_mount_opts *opt = &sbi->opt;



#ifdef CONFIG_EROFS_FS_XATTR

	if (test_opt(opt, XATTR_USER))

		seq_puts(seq, ",user_xattr");

	else

		seq_puts(seq, ",nouser_xattr");

#endif

#ifdef CONFIG_EROFS_FS_POSIX_ACL

	if (test_opt(opt, POSIX_ACL))

		seq_puts(seq, ",acl");

	else

		seq_puts(seq, ",noacl");

#endif

#ifdef CONFIG_EROFS_FS_ZIP

	if (opt->cache_strategy == EROFS_ZIP_CACHE_DISABLED)

		seq_puts(seq, ",cache_strategy=disabled");

	else if (opt->cache_strategy == EROFS_ZIP_CACHE_READAHEAD)

		seq_puts(seq, ",cache_strategy=readahead");

	else if (opt->cache_strategy == EROFS_ZIP_CACHE_READAROUND)

		seq_puts(seq, ",cache_strategy=readaround");

#endif

	if (IS_ENABLED(CONFIG_EROFS_FS_XATTR))

		seq_puts(seq, test_opt(opt, XATTR_USER) ?

				",user_xattr" : ",nouser_xattr");

	if (IS_ENABLED(CONFIG_EROFS_FS_POSIX_ACL))

		seq_puts(seq, test_opt(opt, POSIX_ACL) ? ",acl" : ",noacl");

	if (IS_ENABLED(CONFIG_EROFS_FS_ZIP))

		seq_printf(seq, ",cache_strategy=%s",

			  erofs_param_cache_strategy[opt->cache_strategy].name);

	if (test_opt(opt, DAX_ALWAYS))

		seq_puts(seq, ",dax=always");

	if (test_opt(opt, DAX_NEVER))