[Pkg-lustre-svn-commit] r338 - in /trunk/debian/patches: 00list bug12644-fix-FIEMAP.dpatch

pwinnertz-guest at users.alioth.debian.org pwinnertz-guest at users.alioth.debian.org
Wed Sep 19 12:32:08 UTC 2007


Author: pwinnertz-guest
Date: Wed Sep 19 12:32:08 2007
New Revision: 338

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=338
Log:
Added one more patch from upstream

Added:
    trunk/debian/patches/bug12644-fix-FIEMAP.dpatch
Modified:
    trunk/debian/patches/00list

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=338&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Sep 19 12:32:08 2007
@@ -24,6 +24,7 @@
 bug11771-fix-nfs-export-norootsquash.dpatch
 bug12627-fix-lfs-listnotonlyfiles.dpatch
 bug12052-fix-loopin_lsm_lmm_verify_common.dpatch
+bug12644-fix-FIEMAP.dpatch
 
 # Debian patches
 autogen-run.dpatch

Added: trunk/debian/patches/bug12644-fix-FIEMAP.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/bug12644-fix-FIEMAP.dpatch?rev=338&op=file
==============================================================================
--- trunk/debian/patches/bug12644-fix-FIEMAP.dpatch (added)
+++ trunk/debian/patches/bug12644-fix-FIEMAP.dpatch Wed Sep 19 12:32:08 2007
@@ -1,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: enable file checksumming by default
+
+
+ at DPATCH@
+diff -u -p -r1.1 ext3-fiemap-2.6-sles10.patch
+--- ./ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch	31 Aug 2007 08:45:42 -0000	1.1
++++ ./ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-sles10.patch	12 Sep 2007 21:40:55 -0000
+@@ -54,13 +54,14 @@ Index: linux-2.6.16.46-0.14/include/linu
+ ===================================================================
+ --- 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/exte
+ +	 */
+ +	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 -u -p -r1.1 ext3-fiemap-2.6.18-vanilla.patch
+--- ./ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch	31 Aug 2007 08:45:42 -0000	1.1
++++ ./ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.18-vanilla.patch	12 Sep 2007 21:40:55 -0000
+@@ -66,7 +66,7 @@ Index: linux-2.6.18/include/linux/ext3_e
+ ===================================================================
+ --- 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_e
+ -					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;
+diff -u -p -r1.12.6.10.2.47 fsfilt_ext3.c
+--- ./lustre/lvfs/fsfilt_ext3.c	24 Aug 2007 02:40:38 -0000	1.12.6.10.2.47
++++ ./lustre/lvfs/fsfilt_ext3.c	12 Sep 2007 21:41:00 -0000
+@@ -886,7 +886,11 @@ static unsigned long new_blocks(handle_t
+ 
+ static int ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
+                                   struct ext3_ext_path *path,
+-                                  struct ext3_ext_cache *cex)
++                                  struct ext3_ext_cache *cex
++#ifdef HAVE_EXT_PREPARE_CB_EXTENT
++                                  , struct ext3_extent *ex
++#endif
++                                  )
+ {
+         struct inode *inode = tree->inode;
+         struct bpointers *bp = tree->private;




More information about the Pkg-lustre-svn-commit mailing list