diff options
| author | Debabrata Banerjee <dbanerje@akamai.com> | 2019-05-01 05:08:15 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-05-01 05:08:15 +0200 |
| commit | 50b29d8f033a7c88c5bc011abc2068b1691ab755 (patch) | |
| tree | 705b74260c9525387136f30b65aa5de70424dd57 /fs/ext4 | |
| parent | unicode: refactor the rule for regenerating utf8data.h (diff) | |
| download | linux-50b29d8f033a7c88c5bc011abc2068b1691ab755.tar.xz linux-50b29d8f033a7c88c5bc011abc2068b1691ab755.zip | |
ext4: fix ext4_show_options for file systems w/o journal
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
Diffstat (limited to 'fs/ext4')
| -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 aeb6d22ea0ad..fc6fa2c93e77 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4349,7 +4349,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; |