summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-02-27 17:23:47 -0500
committerTheodore Ts'o <tytso@mit.edu>2011-02-27 17:23:47 -0500
commit4dd89fc6251a6bda2c18e71e7d266e983806579d (patch)
treec2a98ab3ba6a24a10a0eabc5dc818dcc17ad9c5d
parenta54aa76108619e5d8290b49081c2aaaeff5be9a2 (diff)
downloadblackbird-op-linux-4dd89fc6251a6bda2c18e71e7d266e983806579d.tar.gz
blackbird-op-linux-4dd89fc6251a6bda2c18e71e7d266e983806579d.zip
ext4: suppress verbose debugging information if malloc-debug is off
If CONFIG_EXT4_DEBUG is enabled, then if a block allocation fails due to disk being full, a verbose debugging message is printed, even if the malloc-debug switch has not been enabled. Suppress the debugging message so that nothing is printed unless malloc-debug has been turned on. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/mballoc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 66bee7274d6a..2f6f0dd08fca 100644
--- a/fs/ext4/mballoc.c
+++ b/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:"
OpenPOWER on IntegriCloud