Commit 27f394a7 authored Mar 30, 2018 by Tyson Nottingham Committed by Theodore Ts'o Mar 30, 2018

ext4: don't show data=<mode> option if defaulted



Previously, mount -l would show data=<mode> even if the ext4 default
journaling mode was being used. Change this to be consistent with the
rest of the options.

Ext4 already did the right thing when the journaling mode being used
matched the one specified in the superblock's default mount options. The
reason it failed to do the right thing for the ext4 defaults is that,
when set, they were never included in sbi->s_def_mount_opt (unlike the
superblock's defaults, which were).

Signed-off-by: Tyson Nottingham <tgnottingham@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

parent ceec0376

fs/ext4/super.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -4112,10 +4112,13 @@ static int ext4_fill_super(struct super_block sb, void data, int silent)
		* cope, else JOURNAL_DATA
		*/
		if (jbd2_journal_check_available_features
		(sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE))
		(sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE)) {
		set_opt(sb, ORDERED_DATA);
		else
		sbi->s_def_mount_opt \|= EXT4_MOUNT_ORDERED_DATA;
		} else {
		set_opt(sb, JOURNAL_DATA);
		sbi->s_def_mount_opt \|= EXT4_MOUNT_JOURNAL_DATA;
		}
		break;

		case EXT4_MOUNT_ORDERED_DATA: