Re: [this_cpu_xx V6 5/7] this_cpu: Remove slub kmem_cache fields

[Christoph Lameter]

On Wed, 7 Oct 2009, cl@xxxxxxxxxxxxxxxxxxxx wrote:

> @@ -2387,8 +2364,11 @@ static int kmem_cache_open(struct kmem_c
>  	if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA))
>  		goto error;
>
> -	if (alloc_kmem_cache_cpus(s, gfpflags & ~SLUB_DMA))
> +	if (!alloc_kmem_cache_cpus(s, gfpflags & ~SLUB_DMA))
> +
> +	if (s->cpu_slab)
>  		return 1;
> +
>  	free_kmem_cache_nodes(s);

Argh. I goofed while fixing a diff problem shortly before release.

The following patch fixes the patch:

---
 mm/slub.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c	2009-10-07 18:00:06.000000000 -0500
+++ linux-2.6/mm/slub.c	2009-10-07 18:03:05.000000000 -0500
@@ -2364,9 +2364,7 @@ static int kmem_cache_open(struct kmem_c
 	if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA))
 		goto error;

-	if (!alloc_kmem_cache_cpus(s, gfpflags & ~SLUB_DMA))
-
-	if (s->cpu_slab)
+	if (alloc_kmem_cache_cpus(s, gfpflags & ~SLUB_DMA))
 		return 1;

 	free_kmem_cache_nodes(s);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/