Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aad26fa authored by Chengguang Xu's avatar Chengguang Xu Committed by Jan Kara
Browse files

ext2: remove redundant building macro check 



If macro CONFIG_QUOTA is not enabled then mount option flag
of usrquota/grpquota will not be set, so we can remove some
building macro check safely in ext2_shwo_options().
Additionally, I think it's better to define EXT2_MOUNT_DAX
regardless macro CONFIG_FS_DAX is enabled just like acl/xattr.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 1abefb02

fs/ext2/ext2.h

+0 −4
Original line number Diff line number Diff line
@@ -390,11 +390,7 @@ struct ext2_inode { 
#define EXT2_MOUNT_USRQUOTA		0x020000  /* user quota */

#define EXT2_MOUNT_GRPQUOTA		0x040000  /* group quota */

#define EXT2_MOUNT_RESERVATION		0x080000  /* Preallocation */

#ifdef CONFIG_FS_DAX

#define EXT2_MOUNT_DAX			0x100000  /* Direct Access */

#else

#define EXT2_MOUNT_DAX			0

#endif





#define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt

fs/ext2/super.c

+1 −4
Original line number Diff line number Diff line
@@ -309,20 +309,17 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root) 
	if (test_opt(sb, NOBH))

		seq_puts(seq, ",nobh");



#if defined(CONFIG_QUOTA)

	if (sbi->s_mount_opt & EXT2_MOUNT_USRQUOTA)

		seq_puts(seq, ",usrquota");



	if (sbi->s_mount_opt & EXT2_MOUNT_GRPQUOTA)

		seq_puts(seq, ",grpquota");

#endif



#ifdef CONFIG_FS_DAX

	if (sbi->s_mount_opt & EXT2_MOUNT_XIP)

		seq_puts(seq, ",xip");



	if (sbi->s_mount_opt & EXT2_MOUNT_DAX)

		seq_puts(seq, ",dax");

#endif



	if (!test_opt(sb, RESERVATION))

		seq_puts(seq, ",noreservation");