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

Commit 45123ae5 authored by Debabrata Banerjee's avatar Debabrata Banerjee Committed by Greg Kroah-Hartman
Browse files

ext4: fix ext4_show_options for file systems w/o journal 



commit 50b29d8f033a7c88c5bc011abc2068b1691ab755 upstream.

Instead of removing EXT4_MOUNT_JOURNAL_CHECKSUM from s_def_mount_opt as
I assume was intended, all other options were blown away leading to
_ext4_show_options() output being incorrect.

Fixes: 1e381f60 ("ext4: do not allow journal_opts for fs w/o journal")
Signed-off-by: default avatarDebabrata Banerjee <dbanerje@akamai.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7952475

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -4270,7 +4270,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
				 "data=, fs mounted w/o journal");

			goto failed_mount_wq;

		}

		sbi->s_def_mount_opt &= EXT4_MOUNT_JOURNAL_CHECKSUM;

		sbi->s_def_mount_opt &= ~EXT4_MOUNT_JOURNAL_CHECKSUM;

		clear_opt(sb, JOURNAL_CHECKSUM);

		clear_opt(sb, DATA_FLAGS);

		sbi->s_journal = NULL;