+ return max;
+}
+
-+static int __ext3_ext_check_header(const char *function, struct inode *inode,
++static int __ext3_ext_check_header(const char *function, int line, struct inode *inode,
+ struct ext3_extent_header *eh,
+ int depth)
+{
+
+corrupted:
+ ext3_error(inode->i_sb, function,
-+ "bad header in inode #%lu: %s - magic %x, "
-+ "entries %u, max %u(%u), depth %u(%u)",
++ ":%d: bad header in inode #%lu: %s - magic %x, "
++ "entries %u, max %u(%u), depth %u(%u)", line,
+ inode->i_ino, error_msg, le16_to_cpu(eh->eh_magic),
+ le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max),
+ max, le16_to_cpu(eh->eh_depth), depth);
+}
+
+#define ext3_ext_check_header(inode,eh,depth) \
-+ __ext3_ext_check_header(__FUNCTION__,inode,eh,depth)
++ __ext3_ext_check_header(__FUNCTION__,__LINE__,inode,eh,depth)
+
+#ifdef EXT_DEBUG
+static void ext3_ext_show_path(struct inode *inode, struct ext3_ext_path *path)
+ return max;
+}
+
-+static int __ext3_ext_check_header(const char *function, struct inode *inode,
++static int __ext3_ext_check_header(const char *function, int line, struct inode *inode,
+ struct ext3_extent_header *eh,
+ int depth)
+{
+
+corrupted:
+ ext3_error(inode->i_sb, function,
-+ "bad header in inode #%lu: %s - magic %x, "
-+ "entries %u, max %u(%u), depth %u(%u)",
++ ":%d: bad header in inode #%lu: %s - magic %x, "
++ "entries %u, max %u(%u), depth %u(%u)", line,
+ inode->i_ino, error_msg, le16_to_cpu(eh->eh_magic),
+ le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max),
+ max, le16_to_cpu(eh->eh_depth), depth);
+}
+
+#define ext3_ext_check_header(inode,eh,depth) \
-+ __ext3_ext_check_header(__FUNCTION__,inode,eh,depth)
++ __ext3_ext_check_header(__FUNCTION__,__LINE__,inode,eh,depth)
+
+#ifdef EXT_DEBUG
+static void ext3_ext_show_path(struct inode *inode, struct ext3_ext_path *path)
- printk(KERN_ERR "EXT3-fs: invalid magic = 0x%x\n",
- (unsigned)eh->eh_magic);
- return -EIO;
-+static int __ext3_ext_check_header(const char *function, struct inode *inode,
++static int __ext3_ext_check_header(const char *function, int line, struct inode *inode,
+ struct ext3_extent_header *eh, int depth,
+ int max)
+{
+
+corrupted:
+ ext3_error(inode->i_sb, function,
-+ "bad header in inode #%lu: %s - magic %x, "
-+ "entries %u, max %u(%u), depth %u(%u)",
++ ":%d: bad header in inode #%lu: %s - magic %x, "
++ "entries %u, max %u(%u), depth %u(%u)", line,
+ inode->i_ino, error_msg, eh->eh_magic,
+ eh->eh_entries, eh->eh_max, max,
+ eh->eh_depth, depth);
}
+#define ext3_ext_check_header(inode,eh,depth,max) \
-+ __ext3_ext_check_header(__FUNCTION__,inode,eh,depth,max)
++ __ext3_ext_check_header(__FUNCTION__,__LINE__,inode,eh,depth,max)
+
+
static handle_t *ext3_ext_journal_restart(handle_t *handle, int needed)
-
+#include "fiemap.h"
- static int __ext3_ext_check_header(const char *function, struct inode *inode,
+ static int __ext3_ext_check_header(const char *function, int line, struct inode *inode,
struct ext3_extent_header *eh, int depth,
@@ -1484,7 +1484,7 @@ int ext3_ext_walk_space(struct ext3_exte