Skip to content

Commit 50b29d8

Browse files
dbavatartytso
authored andcommitted
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: 1e381f6 ("ext4: do not allow journal_opts for fs w/o journal") Signed-off-by: Debabrata Banerjee <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Jan Kara <[email protected]> Cc: [email protected]
1 parent 28ba53c commit 50b29d8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/ext4/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4349,7 +4349,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
43494349
"data=, fs mounted w/o journal");
43504350
goto failed_mount_wq;
43514351
}
4352-
sbi->s_def_mount_opt &= EXT4_MOUNT_JOURNAL_CHECKSUM;
4352+
sbi->s_def_mount_opt &= ~EXT4_MOUNT_JOURNAL_CHECKSUM;
43534353
clear_opt(sb, JOURNAL_CHECKSUM);
43544354
clear_opt(sb, DATA_FLAGS);
43554355
sbi->s_journal = NULL;

0 commit comments

Comments
 (0)