| author | Debabrata Banerjee <dbanerje@akamai.com> | 2019-05-01 03:08:15 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-21 16:48:59 (GMT) |
| commit | d5258b8a233350bc6cdfd2113d53cf0f1fb3cc1c (patch) | |
| tree | 2d25a9c8c3b5e5c542f05e68dfdb6987f9b0b994 | |
| parent | 083b19c7dddef7504346c4ae233ce3ea43ebf60f (diff) | |
| download | common-d5258b8a233350bc6cdfd2113d53cf0f1fb3cc1c.zip common-d5258b8a233350bc6cdfd2113d53cf0f1fb3cc1c.tar.gz common-d5258b8a233350bc6cdfd2113d53cf0f1fb3cc1c.tar.bz2 | |
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: 1e381f60dad9 ("ext4: do not allow journal_opts for fs w/o journal")
Signed-off-by: Debabrata Banerjee <dbanerje@akamai.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a6c7ace..3261478 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4034,7 +4034,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; |