Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Fix kmem_cache_destroy() with SLAB_DESTROY_BY_RCU
This commit is contained in:
commit
e305fc5ecd
|
@ -2594,8 +2594,6 @@ static inline int kmem_cache_close(struct kmem_cache *s)
|
||||||
*/
|
*/
|
||||||
void kmem_cache_destroy(struct kmem_cache *s)
|
void kmem_cache_destroy(struct kmem_cache *s)
|
||||||
{
|
{
|
||||||
if (s->flags & SLAB_DESTROY_BY_RCU)
|
|
||||||
rcu_barrier();
|
|
||||||
down_write(&slub_lock);
|
down_write(&slub_lock);
|
||||||
s->refcount--;
|
s->refcount--;
|
||||||
if (!s->refcount) {
|
if (!s->refcount) {
|
||||||
|
@ -2606,6 +2604,8 @@ void kmem_cache_destroy(struct kmem_cache *s)
|
||||||
"still has objects.\n", s->name, __func__);
|
"still has objects.\n", s->name, __func__);
|
||||||
dump_stack();
|
dump_stack();
|
||||||
}
|
}
|
||||||
|
if (s->flags & SLAB_DESTROY_BY_RCU)
|
||||||
|
rcu_barrier();
|
||||||
sysfs_slab_remove(s);
|
sysfs_slab_remove(s);
|
||||||
} else
|
} else
|
||||||
up_write(&slub_lock);
|
up_write(&slub_lock);
|
||||||
|
|
Loading…
Reference in New Issue