diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-07-13 09:12:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-14 00:38:43 +0200 |
| commit | fc818301a8a39fedd7f0a71f878f29130c72193d (patch) | |
| tree | 97db2563dab14944f0131bf6d59c712c997ae328 /mm | |
| parent | [PATCH] Fix broken kernel headers preventing ARM build (diff) | |
| download | linux-fc818301a8a39fedd7f0a71f878f29130c72193d.tar.xz linux-fc818301a8a39fedd7f0a71f878f29130c72193d.zip | |
[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 <mingo@elte.hu>
Tested-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mm/slab.c b/mm/slab.c index 5a57cda7490d..0f20843beffd 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); } |