diff --git a/[refs] b/[refs] index abe3158bec61..a07e9baae764 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a54aa76108619e5d8290b49081c2aaaeff5be9a2 +refs/heads/master: 4dd89fc6251a6bda2c18e71e7d266e983806579d diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index 66bee7274d6a..2f6f0dd08fca 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -3912,7 +3912,8 @@ static void ext4_mb_show_ac(struct ext4_allocation_context *ac) struct super_block *sb = ac->ac_sb; ext4_group_t ngroups, i; - if (EXT4_SB(sb)->s_mount_flags & EXT4_MF_FS_ABORTED) + if (!mb_enable_debug || + (EXT4_SB(sb)->s_mount_flags & EXT4_MF_FS_ABORTED)) return; printk(KERN_ERR "EXT4-fs: Can't allocate:"