Branch b1_6

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-fiemap-2.6-sles10.patch

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 b0c1a89..93be2eb 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch
@@ -54,13 +54,14 @@ Index: linux-2.6.16.46-0.14/include/linux/ext3_extents.h
 ===================================================================
 --- linux-2.6.16.46-0.14.orig/include/linux/ext3_extents.h
 +++ linux-2.6.16.46-0.14/include/linux/ext3_extents.h
-@@ -170,7 +170,8 @@ struct ext3_extents_helpers {
+@@ -170,7 +170,9 @@ struct ext3_extents_helpers {
   */
  typedef int (*ext_prepare_callback)(struct ext3_extents_tree *,
                                    struct ext3_ext_path *,
 -                                  struct ext3_ext_cache *);
 +                                  struct ext3_ext_cache *,
 +                                  struct ext3_extent *);
++#define HAVE_EXT_PREPARE_CB_EXTENT
  
  #define EXT_CONTINUE  0
  #define EXT_BREAK     1
@@ -147,12 +148,12 @@ Index: linux-2.6.16.46-0.14/fs/ext3/extents.c
  }
  
 +struct fiemap_internal {
-+      struct fiemap           *fiemap_s;
++      struct fiemap           *fiemap_s;
 +      struct fiemap_extent    fm_extent;
-+      size_t                  tot_mapping_len;
-+      char                    *cur_ext_ptr;
-+      int                     current_extent;
-+      int                     err;
++      size_t                  tot_mapping_len;
++      char                    *cur_ext_ptr;
++      int                     current_extent;
++      int                     err;
 +};
 +
 +/*
@@ -270,7 +271,7 @@ Index: linux-2.6.16.46-0.14/fs/ext3/extents.c
 +       */
 +      down(&EXT3_I(inode)->truncate_sem);
 +      err = ext3_ext_walk_space(&tree, start_blk , EXT_MAX_BLOCK - start_blk,
-+                                (void *)ext3_ext_fiemap_cb);
++                                ext3_ext_fiemap_cb);
 +      up(&EXT3_I(inode)->truncate_sem);
 +      if (err)
 +              return err;