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

Commit 482a7425 authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Theodore Ts'o
Browse files

ext4: mount flags manipulation cleanup 



Replace intermediate EXT4_MOUNT_XXX flags manipulation to
corresponding macro.

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent c8d46e41

fs/ext4/super.c

+13 −18
Original line number Diff line number Diff line
@@ -796,10 +796,10 @@ static inline void ext4_show_quota_options(struct seq_file *seq, 
	if (sbi->s_qf_names[GRPQUOTA])

		seq_printf(seq, ",grpjquota=%s", sbi->s_qf_names[GRPQUOTA]);



	if (sbi->s_mount_opt & EXT4_MOUNT_USRQUOTA)

	if (test_opt(sb, USRQUOTA))

		seq_puts(seq, ",usrquota");



	if (sbi->s_mount_opt & EXT4_MOUNT_GRPQUOTA)

	if (test_opt(sb, GRPQUOTA))

		seq_puts(seq, ",grpquota");

#endif

}
@@ -1383,14 +1383,13 @@ static int parse_options(char *options, struct super_block *sb, 
			data_opt = EXT4_MOUNT_WRITEBACK_DATA;

		datacheck:

			if (is_remount) {

				if ((sbi->s_mount_opt & EXT4_MOUNT_DATA_FLAGS)

						!= data_opt) {

				if (test_opt(sb, DATA_FLAGS) != data_opt) {

					ext4_msg(sb, KERN_ERR,

						"Cannot change data mode on remount");

					return 0;

				}

			} else {

				sbi->s_mount_opt &= ~EXT4_MOUNT_DATA_FLAGS;

				clear_opt(sbi->s_mount_opt, DATA_FLAGS);

				sbi->s_mount_opt |= data_opt;

			}

			break;
@@ -1625,18 +1624,14 @@ static int parse_options(char *options, struct super_block *sb, 
	}

#ifdef CONFIG_QUOTA

	if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {

		if ((sbi->s_mount_opt & EXT4_MOUNT_USRQUOTA) &&

		     sbi->s_qf_names[USRQUOTA])

		if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA])

			clear_opt(sbi->s_mount_opt, USRQUOTA);



		if ((sbi->s_mount_opt & EXT4_MOUNT_GRPQUOTA) &&

		     sbi->s_qf_names[GRPQUOTA])

		if (test_opt(sb, GRPQUOTA) && sbi->s_qf_names[GRPQUOTA])

			clear_opt(sbi->s_mount_opt, GRPQUOTA);



		if ((sbi->s_qf_names[USRQUOTA] &&

				(sbi->s_mount_opt & EXT4_MOUNT_GRPQUOTA)) ||

		    (sbi->s_qf_names[GRPQUOTA] &&

				(sbi->s_mount_opt & EXT4_MOUNT_USRQUOTA))) {

		if ((sbi->s_qf_names[USRQUOTA] && test_opt(sb, GRPQUOTA)) ||

			(sbi->s_qf_names[GRPQUOTA] && test_opt(sb, USRQUOTA))) {

			ext4_msg(sb, KERN_ERR, "old and new quota "

					"format mixing");

			return 0;
@@ -2452,11 +2447,11 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
		set_opt(sbi->s_mount_opt, POSIX_ACL);

#endif

	if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA)

		sbi->s_mount_opt |= EXT4_MOUNT_JOURNAL_DATA;

		set_opt(sbi->s_mount_opt, JOURNAL_DATA);

	else if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_ORDERED)

		sbi->s_mount_opt |= EXT4_MOUNT_ORDERED_DATA;

		set_opt(sbi->s_mount_opt, ORDERED_DATA);

	else if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_WBACK)

		sbi->s_mount_opt |= EXT4_MOUNT_WRITEBACK_DATA;

		set_opt(sbi->s_mount_opt, WRITEBACK_DATA);



	if (le16_to_cpu(sbi->s_es->s_errors) == EXT4_ERRORS_PANIC)

		set_opt(sbi->s_mount_opt, ERRORS_PANIC);
@@ -2484,7 +2479,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
		goto failed_mount;



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

		((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);

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



	if (le32_to_cpu(es->s_rev_level) == EXT4_GOOD_OLD_REV &&

	    (EXT4_HAS_COMPAT_FEATURE(sb, ~0U) ||
@@ -3520,7 +3515,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
		ext4_abort(sb, __func__, "Abort forced by user");



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

		((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);

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



	es = sbi->s_es;