Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e305fc5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 154f807e d76b1590

mm/slub.c

+2 −2
Original line number Diff line number Diff line
@@ -2594,8 +2594,6 @@ static inline int kmem_cache_close(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);

	s->refcount--;

	if (!s->refcount) {
@@ -2606,6 +2604,8 @@ void kmem_cache_destroy(struct kmem_cache *s) 
				"still has objects.\n", s->name, __func__);

			dump_stack();

		}

		if (s->flags & SLAB_DESTROY_BY_RCU)

			rcu_barrier();

		sysfs_slab_remove(s);

	} else

		up_write(&slub_lock);