Branch b1_8

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-max-dir-size-sles11.patch

diff --git a/ldiskfs/kernel_patches/patches/ext4-max-dir-size-sles11.patch b/ldiskfs/kernel_patches/patches/ext4-max-dir-size-sles11.patch
index 0f758d4..4b0db60 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-max-dir-size-sles11.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-max-dir-size-sles11.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.27.21-0.1/fs/ext4/ialloc.c
+Index: linux-stage/fs/ext4/ialloc.c
 ===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ialloc.c
-+++ linux-2.6.27.21-0.1/fs/ext4/ialloc.c
-@@ -721,12 +721,15 @@ struct inode *ext4_new_inode(handle_t *h
+--- linux-stage.orig/fs/ext4/ialloc.c
++++ linux-stage/fs/ext4/ialloc.c
+@@ -700,12 +700,15 @@ struct inode *ext4_new_inode(handle_t *h
                return ERR_PTR(-EPERM);
  
        sb = dir->i_sb;
@@ -19,10 +19,10 @@ Index: linux-2.6.27.21-0.1/fs/ext4/ialloc.c
        es = sbi->s_es;
  
        if (goal) {
-Index: linux-2.6.27.21-0.1/fs/ext4/super.c
+Index: linux-stage/fs/ext4/super.c
 ===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/super.c
-+++ linux-2.6.27.21-0.1/fs/ext4/super.c
+--- linux-stage.orig/fs/ext4/super.c
++++ linux-stage/fs/ext4/super.c
 @@ -41,6 +41,7 @@
  #include <asm/uaccess.h>
  #include <linux/kthread.h>
@@ -40,17 +40,23 @@ Index: linux-2.6.27.21-0.1/fs/ext4/super.c
  ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
                               struct ext4_group_desc *bg)
  {
-@@ -602,6 +605,9 @@ static void ext4_put_super(struct super_
+@@ -564,6 +567,7 @@ static void ext4_put_super(struct super_
+       }
+       if (sbi->s_proc) {
+               remove_proc_entry("inode_readahead_blks", sbi->s_proc);
++              remove_proc_entry(EXT4_MAX_DIR_SIZE_NAME, sbi->s_proc);
+               remove_proc_entry(sb->s_id, ext4_proc_root);
+       }
+ 
+@@ -602,6 +606,7 @@ static void ext4_put_super(struct super_
        }
        if (sbi->s_mmp_tsk)
                kthread_stop(sbi->s_mmp_tsk);
 +
-+      remove_proc_entry(EXT4_MAX_DIR_SIZE_NAME, sbi->s_proc);
-+
        sb->s_fs_info = NULL;
        kfree(sbi);
        return;
-@@ -2287,6 +2293,46 @@ static unsigned long ext4_get_stripe_siz
+@@ -2287,6 +2292,46 @@ static unsigned long ext4_get_stripe_siz
        return 0;
  }
  
@@ -97,7 +103,7 @@ Index: linux-2.6.27.21-0.1/fs/ext4/super.c
  static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                                __releases(kernel_lock)
                                __acquires(kernel_lock)
-@@ -2311,6 +2357,7 @@ static int ext4_fill_super(struct super_
+@@ -2311,6 +2356,7 @@ static int ext4_fill_super(struct super_
        int needs_recovery, has_huge_files;
        int features;
        __u64 blocks_count;
@@ -105,7 +111,7 @@ Index: linux-2.6.27.21-0.1/fs/ext4/super.c
        int err;
  
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
-@@ -2881,6 +2928,22 @@ static int ext4_fill_super(struct super_
+@@ -2880,6 +2926,22 @@ static int ext4_fill_super(struct super_
               test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_ORDERED_DATA ? "ordered":
               "writeback");
  
@@ -128,7 +134,7 @@ Index: linux-2.6.27.21-0.1/fs/ext4/super.c
        lock_kernel();
        return 0;
  
-@@ -3254,7 +3317,6 @@ static void ext4_commit_super(struct sup
+@@ -3253,7 +3315,6 @@ static void ext4_commit_super(struct sup
        }
  }
  
@@ -136,11 +142,11 @@ Index: linux-2.6.27.21-0.1/fs/ext4/super.c
  /*
   * Have we just finished recovery?  If so, and if we are mounting (or
   * remounting) the filesystem readonly, then we will end up with a
-Index: linux-2.6.27.21-0.1/fs/ext4/ext4_sb.h
+Index: linux-stage/fs/ext4/ext4_sb.h
 ===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_sb.h
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4_sb.h
-@@ -120,6 +120,7 @@ struct ext4_sb_info {
+--- linux-stage.orig/fs/ext4/ext4_sb.h
++++ linux-stage/fs/ext4/ext4_sb.h
+@@ -118,6 +118,7 @@ struct ext4_sb_info {
        /* where last allocation was done - for stream allocation */
        unsigned long s_mb_last_group;
        unsigned long s_mb_last_start;
@@ -148,10 +154,10 @@ Index: linux-2.6.27.21-0.1/fs/ext4/ext4_sb.h
  
        /* history to debug policy */
        struct ext4_mb_history *s_mb_history;
-Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h
+Index: linux-stage/fs/ext4/ext4.h
 ===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4.h
+--- linux-stage.orig/fs/ext4/ext4.h
++++ linux-stage/fs/ext4/ext4.h
 @@ -1017,6 +1017,14 @@ struct mmp_struct {
   */
  #define EXT4_MMP_MIN_CHECK_INTERVAL   5
@@ -167,10 +173,10 @@ Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h
  /*
   * Function prototypes
   */
-Index: linux-2.6.27.21-0.1/fs/ext4/mballoc.c
+Index: linux-stage/fs/ext4/mballoc.c
 ===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/mballoc.c
-+++ linux-2.6.27.21-0.1/fs/ext4/mballoc.c
+--- linux-stage.orig/fs/ext4/mballoc.c
++++ linux-stage/fs/ext4/mballoc.c
 @@ -2943,6 +2943,7 @@ err_out:
        remove_proc_entry(EXT4_MB_MIN_TO_SCAN_NAME, sbi->s_proc);
        remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc);