ext2: remove redundant building macro check

[sfrench/cifs-2.6.git] / fs / ext2 / super.c

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 73bd58fa13de40e8c010bfcd0fb96764ab792f79..cb91baa4275d8150664e05d8a1877ca87fca4ff9 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -309,20 +309,17 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
        if (test_opt(sb, NOBH))
                seq_puts(seq, ",nobh");
 
-#if defined(CONFIG_QUOTA)
        if (sbi->s_mount_opt & EXT2_MOUNT_USRQUOTA)
                seq_puts(seq, ",usrquota");
 
        if (sbi->s_mount_opt & EXT2_MOUNT_GRPQUOTA)
                seq_puts(seq, ",grpquota");
-#endif
 
-#ifdef CONFIG_FS_DAX
        if (sbi->s_mount_opt & EXT2_MOUNT_XIP)
                seq_puts(seq, ",xip");
+
        if (sbi->s_mount_opt & EXT2_MOUNT_DAX)
                seq_puts(seq, ",dax");
-#endif
 
        if (!test_opt(sb, RESERVATION))
                seq_puts(seq, ",noreservation");