aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-02-14 15:11:41 -0500
committerTheodore Ts'o <tytso@mit.edu>2013-02-14 15:11:41 -0500
commit8de5c325b4ee7d5b23b95edd28b81c9a2a9f427f (patch)
treec1b0b034636b021a4570496c3f34b9e222316ff7 /fs/ext4
parentb6e96d0067d81f6a300bedee661b5ece8164e210 (diff)
ext4: use KERN_WARNING for warning messages
Some messages printed related to a WARN_ON(1) were printed using KERN_NOTICE. Use KERN_WARNING or ext4_warning() instead so that context related to the WARN_ON() is printed at the same printk warning level (and log files, etc.) Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/ialloc.c12
-rw-r--r--fs/ext4/inode.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 91d8fe3aced3..32fd2b9075dd 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1028,17 +1028,17 @@ iget_failed:
1028 inode = NULL; 1028 inode = NULL;
1029bad_orphan: 1029bad_orphan:
1030 ext4_warning(sb, "bad orphan inode %lu! e2fsck was run?", ino); 1030 ext4_warning(sb, "bad orphan inode %lu! e2fsck was run?", ino);
1031 printk(KERN_NOTICE "ext4_test_bit(bit=%d, block=%llu) = %d\n", 1031 printk(KERN_WARNING "ext4_test_bit(bit=%d, block=%llu) = %d\n",
1032 bit, (unsigned long long)bitmap_bh->b_blocknr, 1032 bit, (unsigned long long)bitmap_bh->b_blocknr,
1033 ext4_test_bit(bit, bitmap_bh->b_data)); 1033 ext4_test_bit(bit, bitmap_bh->b_data));
1034 printk(KERN_NOTICE "inode=%p\n", inode); 1034 printk(KERN_WARNING "inode=%p\n", inode);
1035 if (inode) { 1035 if (inode) {
1036 printk(KERN_NOTICE "is_bad_inode(inode)=%d\n", 1036 printk(KERN_WARNING "is_bad_inode(inode)=%d\n",
1037 is_bad_inode(inode)); 1037 is_bad_inode(inode));
1038 printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%u\n", 1038 printk(KERN_WARNING "NEXT_ORPHAN(inode)=%u\n",
1039 NEXT_ORPHAN(inode)); 1039 NEXT_ORPHAN(inode));
1040 printk(KERN_NOTICE "max_ino=%lu\n", max_ino); 1040 printk(KERN_WARNING "max_ino=%lu\n", max_ino);
1041 printk(KERN_NOTICE "i_nlink=%u\n", inode->i_nlink); 1041 printk(KERN_WARNING "i_nlink=%u\n", inode->i_nlink);
1042 /* Avoid freeing blocks if we got a bad deleted inode */ 1042 /* Avoid freeing blocks if we got a bad deleted inode */
1043 if (inode->i_nlink == 0) 1043 if (inode->i_nlink == 0)
1044 inode->i_blocks = 0; 1044 inode->i_blocks = 0;
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 2fa18bb0bf3c..b85d5dae726b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -343,7 +343,7 @@ void ext4_da_update_reserve_space(struct inode *inode,
343 spin_lock(&ei->i_block_reservation_lock); 343 spin_lock(&ei->i_block_reservation_lock);
344 trace_ext4_da_update_reserve_space(inode, used, quota_claim); 344 trace_ext4_da_update_reserve_space(inode, used, quota_claim);
345 if (unlikely(used > ei->i_reserved_data_blocks)) { 345 if (unlikely(used > ei->i_reserved_data_blocks)) {
346 ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, used %d " 346 ext4_warning(inode->i_sb, "%s: ino %lu, used %d "
347 "with only %d reserved data blocks", 347 "with only %d reserved data blocks",
348 __func__, inode->i_ino, used, 348 __func__, inode->i_ino, used,
349 ei->i_reserved_data_blocks); 349 ei->i_reserved_data_blocks);
@@ -352,7 +352,7 @@ void ext4_da_update_reserve_space(struct inode *inode,
352 } 352 }
353 353
354 if (unlikely(ei->i_allocated_meta_blocks > ei->i_reserved_meta_blocks)) { 354 if (unlikely(ei->i_allocated_meta_blocks > ei->i_reserved_meta_blocks)) {
355 ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, allocated %d " 355 ext4_warning(inode->i_sb, "%s: ino %lu, allocated %d "
356 "with only %d reserved metadata blocks\n", __func__, 356 "with only %d reserved metadata blocks\n", __func__,
357 inode->i_ino, ei->i_allocated_meta_blocks, 357 inode->i_ino, ei->i_allocated_meta_blocks,
358 ei->i_reserved_meta_blocks); 358 ei->i_reserved_meta_blocks);
@@ -1263,7 +1263,7 @@ static void ext4_da_release_space(struct inode *inode, int to_free)
1263 * function is called from invalidate page, it's 1263 * function is called from invalidate page, it's
1264 * harmless to return without any action. 1264 * harmless to return without any action.
1265 */ 1265 */
1266 ext4_msg(inode->i_sb, KERN_NOTICE, "ext4_da_release_space: " 1266 ext4_warning(inode->i_sb, "ext4_da_release_space: "
1267 "ino %lu, to_free %d with only %d reserved " 1267 "ino %lu, to_free %d with only %d reserved "
1268 "data blocks", inode->i_ino, to_free, 1268 "data blocks", inode->i_ino, to_free,
1269 ei->i_reserved_data_blocks); 1269 ei->i_reserved_data_blocks);