Branch b1_6

b=13397
i=adilger
i=alex

-- Use GFP_NOFS instead of SLAB_NOFS.
-- Avoid fork the ext3-mballoc3-core patch.

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch
index 82a9855..ddc64d8 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch
@@ -492,6 +492,15 @@ Index: linux-2.6.18.8/fs/ext3/mballoc.c
 ===================================================================
 --- linux-2.6.18.8.orig/fs/ext3/mballoc.c      2007-07-17 09:18:14.000000000 +0200
 +++ linux-2.6.18.8/fs/ext3/mballoc.c   2007-07-17 09:23:56.000000000 +0200
+@@ -307,7 +307,7 @@
+  */
+ #define MB_DEFAULT_STRIPE             256
+ 
+-static kmem_cache_t *ext3_pspace_cachep = NULL;
++static struct kmem_cache *ext3_pspace_cachep = NULL;
+ 
+ #ifdef EXT3_BB_MAX_BLOCKS
+ #undef EXT3_BB_MAX_BLOCKS
 @@ -350,8 +350,8 @@ struct ext3_prealloc_space {
        spinlock_t              pa_lock;
        atomic_t                pa_count;

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch
index 7396e67..fca4db9 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch
@@ -2389,8 +2389,8 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.c
 +      spin_lock_init(&sbi->s_mb_history_lock);
 +      i = sbi->s_mb_history_max * sizeof(struct ext3_mb_history);
 +      sbi->s_mb_history = kmalloc(i, GFP_KERNEL);
-+       if (likely(sbi->s_mb_history != NULL))
-+               memset(sbi->s_mb_history, 0, i);
++      if (likely(sbi->s_mb_history != NULL))
++              memset(sbi->s_mb_history, 0, i);
 +      /* if we can't allocate history, then we simple won't use it */
 +}
 +
@@ -3615,7 +3615,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.c
 +      BUG_ON(ac->ac_status != AC_STATUS_FOUND);
 +      BUG_ON(!S_ISREG(ac->ac_inode->i_mode));
 +
-+      pa = kmem_cache_alloc(ext3_pspace_cachep, SLAB_NOFS);
++      pa = kmem_cache_alloc(ext3_pspace_cachep, GFP_NOFS);
 +      if (pa == NULL)
 +              return -ENOMEM;
 +
@@ -3700,7 +3700,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.c
 +      BUG_ON(!S_ISREG(ac->ac_inode->i_mode));
 +
 +      BUG_ON(ext3_pspace_cachep == NULL);
-+      pa = kmem_cache_alloc(ext3_pspace_cachep, SLAB_NOFS);
++      pa = kmem_cache_alloc(ext3_pspace_cachep, GFP_NOFS);
 +      if (pa == NULL)
 +              return -ENOMEM;
 +

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
index 7849685..8c091fb 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.22-vanilla.series
@@ -4,7 +4,7 @@ ext3-map_inode_page-2.6.18.patch
 export-ext3-2.6-rhel4.patch
 ext3-include-fixes-2.6-rhel4.patch
 ext3-extents-2.6.22-vanilla.patch
-ext3-mballoc3-core-2.6.22-vanilla.patch
+ext3-mballoc3-core.patch
 ext3-mballoc3-2.6.22.patch
 ext3-nlinks-2.6.22-vanilla.patch
 ext3-ialloc-2.6.22-vanilla.patch
@@ -15,5 +15,4 @@ ext3-nanosecond-2.6.22-vanilla.patch
 ext3-inode-version-2.6.18-vanilla.patch
 ext3-mmp-2.6.22-vanilla.patch
 ext3-fiemap-2.6.22-vanilla.patch
-ext3-block-bitmap-validation-2.6-rhel5.patch
 ext3-statfs-2.6.22.patch