LU-1548 osd: move i_htree_lock to iam container

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-pdir-fix-rhel6.patch

diff --git a/ldiskfs/kernel_patches/patches/ext4-pdir-fix-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-pdir-fix-rhel6.patch
index fc7c791..419f386 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-pdir-fix-rhel6.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-pdir-fix-rhel6.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.32.i386/fs/ext4/ext4.h
+Index: linux-stage/fs/ext4/ext4.h
 ===================================================================
---- linux-2.6.32.i386.orig/fs/ext4/ext4.h      2010-04-16 03:39:11.000000000 +0530
-+++ linux-2.6.32.i386/fs/ext4/ext4.h   2010-04-16 04:27:41.000000000 +0530
-@@ -29,6 +29,7 @@
+--- linux-stage.orig/fs/ext4/ext4.h    2012-08-07 11:52:38.994200699 -0700
++++ linux-stage/fs/ext4/ext4.h 2012-08-07 12:28:19.497442862 -0700
+@@ -16,6 +16,7 @@
  #ifndef _EXT4_H
  #define _EXT4_H
  
@@ -10,22 +10,21 @@ Index: linux-2.6.32.i386/fs/ext4/ext4.h
  #include <linux/types.h>
  #include <linux/blkdev.h>
  #include <linux/magic.h>
-@@ -621,6 +622,10 @@
-       ext4_fsblk_t    i_file_acl;
+@@ -706,6 +707,9 @@
        __u32   i_dtime;
+       ext4_fsblk_t    i_file_acl;
  
 +      /* following fields for parallel directory operations -bzzz */
-+      struct dynlock   i_htree_lock;
 +      struct semaphore i_append_sem;
 +
        /*
         * i_block_group is the number of the block group which contains
         * this file's inode.  Constant across the lifetime of the inode,
-Index: linux-2.6.32.i386/fs/ext4/namei.c
+Index: linux-stage/fs/ext4/namei.c
 ===================================================================
---- linux-2.6.32.i386.orig/fs/ext4/namei.c     2010-04-15 07:42:15.000000000 +0530
-+++ linux-2.6.32.i386/fs/ext4/namei.c  2010-04-16 04:26:03.000000000 +0530
-@@ -54,6 +54,11 @@
+--- linux-stage.orig/fs/ext4/namei.c   2012-08-07 11:52:38.992199430 -0700
++++ linux-stage/fs/ext4/namei.c        2012-08-07 12:27:24.845281099 -0700
+@@ -53,6 +53,11 @@
                                        ext4_lblk_t *block, int *err)
  {
        struct buffer_head *bh;
@@ -37,7 +36,7 @@ Index: linux-2.6.32.i386/fs/ext4/namei.c
  
        *block = inode->i_size >> inode->i_sb->s_blocksize_bits;
  
-@@ -66,7 +71,9 @@
+@@ -65,7 +70,9 @@
                        brelse(bh);
                        bh = NULL;
                }
@@ -47,15 +46,14 @@ Index: linux-2.6.32.i386/fs/ext4/namei.c
        return bh;
  }
  
-Index: linux-2.6.32.i386/fs/ext4/super.c
+Index: linux-stage/fs/ext4/super.c
 ===================================================================
---- linux-2.6.32.i386.orig/fs/ext4/super.c     2010-04-16 03:39:11.000000000 +0530
-+++ linux-2.6.32.i386/fs/ext4/super.c  2010-04-16 04:26:03.000000000 +0530
-@@ -700,6 +700,8 @@
+--- linux-stage.orig/fs/ext4/super.c   2012-08-07 11:52:39.009197356 -0700
++++ linux-stage/fs/ext4/super.c        2012-08-07 12:28:29.499112997 -0700
+@@ -749,6 +749,7 @@
  
        ei->vfs_inode.i_version = 1;
        ei->vfs_inode.i_data.writeback_index = 0;
-+      dynlock_init(&ei->i_htree_lock);
 +      sema_init(&ei->i_append_sem, 1);
        memset(&ei->i_cached_extent, 0, sizeof(struct ext4_ext_cache));
        INIT_LIST_HEAD(&ei->i_prealloc_list);