From 312bb0fdeda7be02bdd0e83fe14f7f8bac9bd890 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Thu, 6 Dec 2007 12:36:42 +0000 Subject: [PATCH] Branch HEAD b=13397 i=adilger i=alex Use GFP_NOFS instead of SLAB_NOFS. --- ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch index 7396e67..fca4db9 100644 --- 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; + -- 1.8.3.1