From fc818301a8a39fedd7f0a71f878f29130c72193d Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 13 Jul 2006 09:12:21 +0200 Subject: [PATCH] revert slab.c locking change Chandra Seetharaman reported SLAB crashes caused by the slab.c lock annotation patch. There is only one chunk of that patch that has a material effect on the slab logic - this patch undoes that chunk. This was confirmed to fix the slab problem by Chandra. Signed-off-by: Ingo Molnar Tested-by: Chandra Seetharaman Signed-off-by: Linus Torvalds --- mm/slab.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 5a57cda7490..0f20843beff 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3119,16 +3119,7 @@ static void free_block(struct kmem_cache *cachep, void **objpp, int nr_objects, if (slabp->inuse == 0) { if (l3->free_objects > l3->free_limit) { l3->free_objects -= cachep->num; - /* - * It is safe to drop the lock. The slab is - * no longer linked to the cache. cachep - * cannot disappear - we are using it and - * all destruction of caches must be - * serialized properly by the user. - */ - spin_unlock(&l3->list_lock); slab_destroy(cachep, slabp); - spin_lock(&l3->list_lock); } else { list_add(&slabp->list, &l3->slabs_free); } -- cgit v1.2.3-18-g5258