Land b_ldiskfs_gate onto HEAD (20081218_1420)

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-fiemap-2.6.22-vanilla.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch
index 62905c2..76474bf 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-fiemap-2.6.22-vanilla.patch
@@ -199,27 +199,26 @@ Index: linux-2.6.22.14/include/linux/ext3_fs.h
  
  /*
   * ioctl commands in 32 bit emulation
-@@ -281,6 +282,9 @@ struct ext3_new_group_data {
+@@ -280,6 +281,8 @@ struct ext3_new_group_data {
+ #define EXT3_IOC32_GETVERSION_OLD     FS_IOC32_GETVERSION
  #define EXT3_IOC32_SETVERSION_OLD     FS_IOC32_SETVERSION
  
- 
 +/* FIEMAP flags supported by ext3 */
 +#define       EXT3_FIEMAP_FLAGS_COMPAT (FIEMAP_FLAG_SYNC)
-+
+ 
  /*
   *  Mount options
-  */
-@@ -1056,6 +1060,9 @@ extern int ext3_block_truncate_page(hand
+@@ -1056,6 +1059,9 @@ extern int ext3_block_truncate_page(hand
  extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
                       unsigned long);
  extern long ext3_compat_ioctl (struct file *, unsigned int, unsigned long);
 +struct fiemap_extent_info;
 +extern int ext3_fiemap(struct inode *, struct fiemap_extent_info *, __u64,
-+                     __u64);
++                      __u64);
  
  /* namei.c */
  extern int ext3_orphan_add(handle_t *, struct inode *);
-@@ -1133,7 +1140,6 @@ ext3_get_blocks_wrap(handle_t *handle, s
+@@ -1133,7 +1139,6 @@ ext3_get_blocks_wrap(handle_t *handle, s
        return ret;
  }