ext4: remove explicit WARN_ON when ext4_map_blocks() fails

PATCH Applied Lukas Czerner 2 participants 2 messages Jan 28, 2013 – Jan 29, 2013 ext4 file system

Share & tools

Lukas Czerner

author

2013-01-28 09:14 UTC #0 lore raw

PATCH 1/1 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 Lukas Czerner <[email protected]>

---
 fs/ext4/extents.c |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

fs/ext4/extents.c +11 ~~-13~~

index 5ae1674..88d31f5 100644
@@ -4459,11 +4459,11 @@ retry:
 		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);

@@ -4536,14 +4536,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: "
-				 "ext4_ext_map_blocks returned %d",
-				 __func__, __LINE__, inode->i_ino, map.m_lblk,
-				 map.m_len, ret);
-		}
+		if (ret <= 0)
+			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);
 		ext4_mark_inode_dirty(handle, inode);
 		ret2 = ext4_journal_stop(handle);
 		if (ret <= 0 || ret2 )

Signature · 1 line

1.7.7.6

Theodore Ts'o

maintainer Applied

2013-01-29 02:22 UTC #1 lore raw

Quoted 7 lines · Lukas Czerner

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 Lukas Czerner <[email protected]>

Thanks, applied.

- Ted