linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ext4: call WARN_ON after the debug message
@ 2013-01-24 16:30 Lukas Czerner
  2013-01-24 16:30 ` [PATCH 2/2] ext4: remove unused variable flags Lukas Czerner
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Lukas Czerner @ 2013-01-24 16:30 UTC (permalink / raw)
  To: linux-ext4; +Cc: tytso, Lukas Czerner

In two places we call WARN_ON() before we print out the debug message,
however the custom is to print such messages before we call WARN_ON() so
change that.

Also use ext4_msg() instead of plain printk().

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 fs/ext4/extents.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 5ae1674..b23e1aa 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4459,11 +4459,12 @@ 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_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);
+			WARN_ON(1);
 #endif
 			ext4_mark_inode_dirty(handle, inode);
 			ret2 = ext4_journal_stop(handle);
@@ -4537,12 +4538,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);
+			WARN_ON(1);
 		}
 		ext4_mark_inode_dirty(handle, inode);
 		ret2 = ext4_journal_stop(handle);
-- 
1.7.7.6


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2013-01-28  7:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-24 16:30 [PATCH 1/2] ext4: call WARN_ON after the debug message Lukas Czerner
2013-01-24 16:30 ` [PATCH 2/2] ext4: remove unused variable flags Lukas Czerner
2013-01-24 16:46   ` gnehzuil.liu
2013-01-24 16:44 ` [PATCH 1/2] ext4: call WARN_ON after the debug message gnehzuil.liu
2013-01-24 19:54 ` Theodore Ts'o
2013-01-25  9:22   ` Lukáš Czerner
2013-01-25 15:09     ` Theodore Ts'o
2013-01-25 15:14       ` Lukáš Czerner
2013-01-26  1:00       ` Dave Chinner
2013-01-28  7:10         ` Lukáš Czerner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).