X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext3-mballoc3-core.patch;h=fca4db912fa1ba650b90b60d787b2397be5bd351;hp=7396e67a54c27e4e13c409bace1f2123168ddee5;hb=b9366f645ef621eb9b859d89ac580432faecc10c;hpb=fceb71c7cf419731a0e061ed6e09659cd149c9ff

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;
 +