aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2009-09-29 15:51:30 -0400
committerTheodore Ts'o <tytso@mit.edu>2009-09-29 15:51:30 -0400
commit90576c0b9a0b5323fc4bd7f23f49be0d234f36d1 (patch)
treed4a1ab6f923f1c9c7c87f13a828db72c1f4412c1 /fs/ext4/super.c
parentd3d1faf6a74496ea4435fd057c6a2cad49f3e523 (diff)
ext4, jbd2: Drop unneeded printks at mount and unmount time
There are a number of kernel printk's which are printed when an ext4 filesystem is mounted and unmounted. Disable them to economize space in the system logs. In addition, disabling the mballoc stats by default saves a number of unneeded atomic operations for every block allocation or deallocation. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r--fs/ext4/super.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3f7e7010c098..e5b206a043a5 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1673,13 +1673,6 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
1673 EXT4_INODES_PER_GROUP(sb), 1673 EXT4_INODES_PER_GROUP(sb),
1674 sbi->s_mount_opt); 1674 sbi->s_mount_opt);
1675 1675
1676 if (EXT4_SB(sb)->s_journal) {
1677 ext4_msg(sb, KERN_INFO, "%s journal on %s",
1678 EXT4_SB(sb)->s_journal->j_inode ? "internal" :
1679 "external", EXT4_SB(sb)->s_journal->j_devname);
1680 } else {
1681 ext4_msg(sb, KERN_INFO, "no journal");
1682 }
1683 return res; 1676 return res;
1684} 1677}
1685 1678
@@ -2885,12 +2878,12 @@ no_journal:
2885 "available"); 2878 "available");
2886 } 2879 }
2887 2880
2888 if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) { 2881 if (test_opt(sb, DELALLOC) &&
2882 (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)) {
2889 ext4_msg(sb, KERN_WARNING, "Ignoring delalloc option - " 2883 ext4_msg(sb, KERN_WARNING, "Ignoring delalloc option - "
2890 "requested data journaling mode"); 2884 "requested data journaling mode");
2891 clear_opt(sbi->s_mount_opt, DELALLOC); 2885 clear_opt(sbi->s_mount_opt, DELALLOC);
2892 } else if (test_opt(sb, DELALLOC)) 2886 }
2893 ext4_msg(sb, KERN_INFO, "delayed allocation enabled");
2894 2887
2895 err = ext4_setup_system_zone(sb); 2888 err = ext4_setup_system_zone(sb);
2896 if (err) { 2889 if (err) {
@@ -3202,9 +3195,7 @@ static int ext4_load_journal(struct super_block *sb,
3202 return -EINVAL; 3195 return -EINVAL;
3203 } 3196 }
3204 3197
3205 if (journal->j_flags & JBD2_BARRIER) 3198 if (!(journal->j_flags & JBD2_BARRIER))
3206 ext4_msg(sb, KERN_INFO, "barriers enabled");
3207 else
3208 ext4_msg(sb, KERN_INFO, "barriers disabled"); 3199 ext4_msg(sb, KERN_INFO, "barriers disabled");
3209 3200
3210 if (!really_read_only && test_opt(sb, UPDATE_JOURNAL)) { 3201 if (!really_read_only && test_opt(sb, UPDATE_JOURNAL)) {