Skip to content

Commit 275abf5

Browse files
OGAWAHirofumiLinus Torvalds
authored andcommitted
[PATCH] ext3: ext3_show_options fix
EXT3_MOUNT_DATA_FLAGS is not a boolean. This fixes it. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
1 parent ff69416 commit 275abf5

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

fs/ext3/super.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,15 +512,14 @@ static void ext3_clear_inode(struct inode *inode)
512512

513513
static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs)
514514
{
515-
struct ext3_sb_info *sbi = EXT3_SB(vfs->mnt_sb);
515+
struct super_block *sb = vfs->mnt_sb;
516+
struct ext3_sb_info *sbi = EXT3_SB(sb);
516517

517-
if (sbi->s_mount_opt & EXT3_MOUNT_JOURNAL_DATA)
518+
if (test_opt(sb, DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA)
518519
seq_puts(seq, ",data=journal");
519-
520-
if (sbi->s_mount_opt & EXT3_MOUNT_ORDERED_DATA)
520+
else if (test_opt(sb, DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA)
521521
seq_puts(seq, ",data=ordered");
522-
523-
if (sbi->s_mount_opt & EXT3_MOUNT_WRITEBACK_DATA)
522+
else if (test_opt(sb, DATA_FLAGS) == EXT3_MOUNT_WRITEBACK_DATA)
524523
seq_puts(seq, ",data=writeback");
525524

526525
#if defined(CONFIG_QUOTA)

0 commit comments

Comments
 (0)