Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 2c68dec..8f907e9 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3011,6 +3011,15 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
        } else if (test_opt2(sb, DAX_INODE)) {
                SEQ_OPTS_PUTS("dax=inode");
        }
+
+       if (sbi->s_groups_count >= MB_DEFAULT_LINEAR_SCAN_THRESHOLD &&
+                       !test_opt2(sb, MB_OPTIMIZE_SCAN)) {
+               SEQ_OPTS_PUTS("mb_optimize_scan=0");
+       } else if (sbi->s_groups_count < MB_DEFAULT_LINEAR_SCAN_THRESHOLD &&
+                       test_opt2(sb, MB_OPTIMIZE_SCAN)) {
+               SEQ_OPTS_PUTS("mb_optimize_scan=1");
+       }
+
        ext4_show_quota_options(seq, sb);
        return 0;
 }
@@ -5523,7 +5532,7 @@ static int ext4_fill_super(struct super_block *sb, struct fs_context *fc)
                         "Quota mode: %s.", descr, ext4_quota_mode(sb));
 
        /* Update the s_overhead_clusters if necessary */
-       ext4_update_overhead(sb);
+       ext4_update_overhead(sb, false);
        return 0;
 
 free_sbi:
@@ -5585,7 +5594,7 @@ static struct inode *ext4_get_journal_inode(struct super_block *sb,
                return NULL;
        }
 
-       jbd_debug(2, "Journal inode found at %p: %lld bytes\n",
+       ext4_debug("Journal inode found at %p: %lld bytes\n",
                  journal_inode, journal_inode->i_size);
        if (!S_ISREG(journal_inode->i_mode)) {
                ext4_msg(sb, KERN_ERR, "invalid journal inode");