Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de5c325 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

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: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent b6e96d00

fs/ext4/ialloc.c

+6 −6
Original line number Diff line number Diff line
@@ -1028,17 +1028,17 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) 
	inode = NULL;

bad_orphan:

	ext4_warning(sb, "bad orphan inode %lu!  e2fsck was run?", ino);

	printk(KERN_NOTICE "ext4_test_bit(bit=%d, block=%llu) = %d\n",

	printk(KERN_WARNING "ext4_test_bit(bit=%d, block=%llu) = %d\n",

	       bit, (unsigned long long)bitmap_bh->b_blocknr,

	       ext4_test_bit(bit, bitmap_bh->b_data));

	printk(KERN_NOTICE "inode=%p\n", inode);

	printk(KERN_WARNING "inode=%p\n", inode);

	if (inode) {

		printk(KERN_NOTICE "is_bad_inode(inode)=%d\n",

		printk(KERN_WARNING "is_bad_inode(inode)=%d\n",

		       is_bad_inode(inode));

		printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%u\n",

		printk(KERN_WARNING "NEXT_ORPHAN(inode)=%u\n",

		       NEXT_ORPHAN(inode));

		printk(KERN_NOTICE "max_ino=%lu\n", max_ino);

		printk(KERN_NOTICE "i_nlink=%u\n", inode->i_nlink);

		printk(KERN_WARNING "max_ino=%lu\n", max_ino);

		printk(KERN_WARNING "i_nlink=%u\n", inode->i_nlink);

		/* Avoid freeing blocks if we got a bad deleted inode */

		if (inode->i_nlink == 0)

			inode->i_blocks = 0;

fs/ext4/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void ext4_da_update_reserve_space(struct inode *inode, 
	spin_lock(&ei->i_block_reservation_lock);

	trace_ext4_da_update_reserve_space(inode, used, quota_claim);

	if (unlikely(used > ei->i_reserved_data_blocks)) {

		ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, used %d "

		ext4_warning(inode->i_sb, "%s: ino %lu, used %d "

			 "with only %d reserved data blocks",

			 __func__, inode->i_ino, used,

			 ei->i_reserved_data_blocks);
@@ -352,7 +352,7 @@ void ext4_da_update_reserve_space(struct inode *inode, 
	}



	if (unlikely(ei->i_allocated_meta_blocks > ei->i_reserved_meta_blocks)) {

		ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, allocated %d "

		ext4_warning(inode->i_sb, "%s: ino %lu, allocated %d "

			 "with only %d reserved metadata blocks\n", __func__,

			 inode->i_ino, ei->i_allocated_meta_blocks,

			 ei->i_reserved_meta_blocks);
@@ -1263,7 +1263,7 @@ static void ext4_da_release_space(struct inode *inode, int to_free) 
		 * function is called from invalidate page, it's

		 * harmless to return without any action.

		 */

		ext4_msg(inode->i_sb, KERN_NOTICE, "ext4_da_release_space: "

		ext4_warning(inode->i_sb, "ext4_da_release_space: "

			 "ino %lu, to_free %d with only %d reserved "

			 "data blocks", inode->i_ino, to_free,

			 ei->i_reserved_data_blocks);