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

Commit b06acd38 authored by Lukas Czerner's avatar Lukas Czerner Committed by Theodore Ts'o
Browse files

ext4: remove explicit WARN_ON when ext4_map_blocks() fails 



In two places we call WARN_ON() before we print out the debug message,
however we agreed that the WARN_ON() is unnecessary at those places so
remove them.

Also use ext4_warning() instead of ext4_msg() and printk().

Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent cfa72754

fs/ext4/extents.c

+11 −13
Original line number Diff line number Diff line
@@ -4462,11 +4462,11 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
		ret = ext4_map_blocks(handle, inode, &map, flags);

		if (ret <= 0) {

#ifdef EXT4FS_DEBUG

			WARN_ON(ret <= 0);

			printk(KERN_ERR "%s: ext4_ext_map_blocks "

				    "returned error inode#%lu, block=%u, "

				    "max_blocks=%u", __func__,

				    inode->i_ino, map.m_lblk, max_blocks);

			ext4_warning(inode->i_sb,

				     "inode #%lu: block %u: len %u: "

				     "ext4_ext_map_blocks returned %d",

				     inode->i_ino, map.m_lblk,

				     map.m_len, ret);

#endif

			ext4_mark_inode_dirty(handle, inode);

			ret2 = ext4_journal_stop(handle);
@@ -4539,14 +4539,12 @@ int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset, 
		}

		ret = ext4_map_blocks(handle, inode, &map,

				      EXT4_GET_BLOCKS_IO_CONVERT_EXT);

		if (ret <= 0) {

			WARN_ON(ret <= 0);

			ext4_msg(inode->i_sb, KERN_ERR,

				 "%s:%d: inode #%lu: block %u: len %u: "

		if (ret <= 0)

			ext4_warning(inode->i_sb,

				     "inode #%lu: block %u: len %u: "

				     "ext4_ext_map_blocks returned %d",

				 __func__, __LINE__, inode->i_ino, map.m_lblk,

				     inode->i_ino, map.m_lblk,

				     map.m_len, ret);

		}

		ext4_mark_inode_dirty(handle, inode);

		ret2 = ext4_journal_stop(handle);

		if (ret <= 0 || ret2 )