slab: Fix a typo in commit 8c138b "slab: Get rid of obj_size macro"
authorFeng Tang <feng.tang@intel.com>
Mon, 2 Jul 2012 06:29:10 +0000 (14:29 +0800)
committerPekka Enberg <penberg@kernel.org>
Mon, 2 Jul 2012 10:45:52 +0000 (13:45 +0300)
Commit  8c138b only sits in Pekka's and linux-next tree now, which tries
to replace obj_size(cachep) with cachep->object_size, but has a typo in
kmem_cache_free() by using "size" instead of "object_size", which casues
some regressions.

Reported-and-tested-by: Fengguang Wu <wfg@linux.intel.com>
Signed-off-by: Feng Tang <feng.tang@intel.com>
Cc: Christoph Lameter <cl@linux.com>
Acked-by: Glauber Costa <glommer@parallels.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
mm/slab.c

index d95ad4c37f6494225d5ca88b8ca88a2c0727a99e..8b7cb802a754ed925e33366b9c53619d308db8e1 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3890,7 +3890,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
        unsigned long flags;
 
        local_irq_save(flags);
-       debug_check_no_locks_freed(objp, cachep->size);
+       debug_check_no_locks_freed(objp, cachep->object_size);
        if (!(cachep->flags & SLAB_DEBUG_OBJECTS))
                debug_check_no_obj_freed(objp, cachep->object_size);
        __cache_free(cachep, objp, __builtin_return_address(0));