From 0219ad310a7a26205a1863c810305abb3f56481f Mon Sep 17 00:00:00 2001 From: kalpak Date: Sat, 15 Sep 2007 06:56:00 +0000 Subject: [PATCH] b=13610 i=andreas, johann The changed prototype of ext_prepare_callback will be used in lustre if HAVE_EXT_PREPARE_CB_EXTENT is defined. --- ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch | 5 +++-- ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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..f4b52d8 100644 --- 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 @@ -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; diff --git a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch index 7ff86a6..3c4d700 100644 --- a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch @@ -66,7 +66,7 @@ Index: linux-2.6.18/include/linux/ext3_extents.h =================================================================== --- linux-2.6.18.orig/include/linux/ext3_extents.h +++ linux-2.6.18/include/linux/ext3_extents.h -@@ -142,8 +142,8 @@ struct ext3_ext_path { +@@ -142,8 +142,9 @@ struct ext3_ext_path { * callback must return valid extent (passed or newly created) */ typedef int (*ext_prepare_callback)(struct inode *, struct ext3_ext_path *, @@ -74,6 +74,7 @@ Index: linux-2.6.18/include/linux/ext3_extents.h - void *); + struct ext3_ext_cache *, + struct ext3_extent *, void *); ++#define HAVE_EXT_PREPARE_CB_EXTENT #define EXT_CONTINUE 0 #define EXT_BREAK 1 @@ -264,7 +265,7 @@ Index: linux-2.6.18/fs/ext3/extents.c + */ + mutex_lock(&EXT3_I(inode)->truncate_mutex); + err = ext3_ext_walk_space(inode, start_blk , EXT_MAX_BLOCK - start_blk, -+ (void *)ext3_ext_fiemap_cb, &fiemap_i); ++ ext3_ext_fiemap_cb, &fiemap_i); + mutex_unlock(&EXT3_I(inode)->truncate_mutex); + if (err) + return err; -- 1.8.3.1