Better handle error messages in extents code.

b=14864
i=adilger
i=deen

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
index cacaf09..1aac380 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
@@ -231,7 +231,7 @@ Index: linux-2.6.18.8/fs/ext3/extents.c
 +      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)
 +{
@@ -269,8 +269,8 @@ Index: linux-2.6.18.8/fs/ext3/extents.c
 +
 +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);
@@ -279,7 +279,7 @@ Index: linux-2.6.18.8/fs/ext3/extents.c
 +}
 +
 +#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)

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch
index 11e889f..956fc07 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch
@@ -231,7 +231,7 @@ Index: linux-2.6.18.8/fs/ext3/extents.c
 +      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)
 +{
@@ -269,8 +269,8 @@ Index: linux-2.6.18.8/fs/ext3/extents.c
 +
 +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);
@@ -279,7 +279,7 @@ Index: linux-2.6.18.8/fs/ext3/extents.c
 +}
 +
 +#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)

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-sanity-checks.patch b/ldiskfs/kernel_patches/patches/ext3-extents-sanity-checks.patch
index 6c22585..eab19b4 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-sanity-checks.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-sanity-checks.patch
@@ -12,7 +12,7 @@ Index: linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/extents.c
 -              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)
 +{
@@ -57,8 +57,8 @@ Index: linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/extents.c
 +
 +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);
@@ -67,7 +67,7 @@ Index: linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/extents.c
  }
  
 +#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)

diff --git a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch
index 93be2eb..c64471a 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch
@@ -113,7 +113,7 @@ Index: linux-2.6.16.46-0.14/fs/ext3/extents.c
 -
 +#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