X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext3-fiemap-2.6.18-vanilla.patch;h=2920823c05668d8ffe26c6e83e338afb14400895;hb=231f091f14b064041c62131e228de02ff249def0;hp=7ff86a68ef5f141decded56ff071b4085e93dc28;hpb=98487d6169ae319b6ddfea29702515cd55e76a5c;p=fs%2Flustre-release.git

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..2920823 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
@@ -145,12 +146,12 @@ Index: linux-2.6.18/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;
 +};
 +
 +/*
@@ -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;
@@ -292,7 +293,7 @@ Index: linux-2.6.18/fs/ext3/fiemap.h
 +/*
 + * linux/fs/ext3/fiemap.h
 + *
-+ * Copyright (C) 2007 Cluster File Systems, Inc
++ * Copyright 2008 Sun Microsystems, Inc.
 + *
 + * Author: Kalpak Shah <kalpak@clusterfs.com>
 + */