Commit 38fa0e8e authored by Chengguang Xu's avatar Chengguang Xu Committed by Jan Kara
Browse files

ext2: code cleanup by using test_opt() and clear_opt() 



Using test_opt() and clear_opt() instead of directly
comparing flag bit of mount option.

Signed-off-by: default avatarChengguang Xu <cgxu519@zoho.com.cn>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent e15d92be

fs/ext2/super.c

+8 −9
Original line number Diff line number Diff line
@@ -302,16 +302,16 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root) 
	if (test_opt(sb, NOBH))

		seq_puts(seq, ",nobh");



	if (sbi->s_mount_opt & EXT2_MOUNT_USRQUOTA)

	if (test_opt(sb, USRQUOTA))

		seq_puts(seq, ",usrquota");



	if (sbi->s_mount_opt & EXT2_MOUNT_GRPQUOTA)

	if (test_opt(sb, GRPQUOTA))

		seq_puts(seq, ",grpquota");



	if (sbi->s_mount_opt & EXT2_MOUNT_XIP)

	if (test_opt(sb, XIP))

		seq_puts(seq, ",xip");



	if (sbi->s_mount_opt & EXT2_MOUNT_DAX)

	if (test_opt(sb, DAX))

		seq_puts(seq, ",dax");



	if (!test_opt(sb, RESERVATION))
@@ -934,8 +934,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	sbi->s_resgid = opts.s_resgid;



	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |

		((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ?

		 SB_POSIXACL : 0);

		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);

	sb->s_iflags |= SB_I_CGROUPWB;



	if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV &&
@@ -966,11 +965,11 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 


	blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);



	if (sbi->s_mount_opt & EXT2_MOUNT_DAX) {

	if (test_opt(sb, DAX)) {

		if (!bdev_dax_supported(sb->s_bdev, blocksize)) {

			ext2_msg(sb, KERN_ERR,

				"DAX unsupported by block device. Turning off DAX.");

			sbi->s_mount_opt &= ~EXT2_MOUNT_DAX;

			clear_opt(sbi->s_mount_opt, DAX);

		}

	}
@@ -1403,7 +1402,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) 
	sbi->s_resuid = new_opts.s_resuid;

	sbi->s_resgid = new_opts.s_resgid;

	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |

		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? SB_POSIXACL : 0);

		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);

	spin_unlock(&sbi->s_lock);



	return 0;