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

Commit 49bd5221 authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

slub: Move map/flag clearing to __free_slab 



__free_slab does some diagnostics. The resetting of mapcount etc
in discard_slab() can interfere with debug processing. So move
the reset immediately before the page is freed.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 50ef37b9

mm/slub.c

+2 −2
Original line number Diff line number Diff line
@@ -1125,6 +1125,8 @@ static void __free_slab(struct kmem_cache *s, struct page *page) 
		NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE,

		-pages);



	__ClearPageSlab(page);

	reset_page_mapcount(page);

	__free_pages(page, s->order);

}
@@ -1154,8 +1156,6 @@ static void discard_slab(struct kmem_cache *s, struct page *page) 
	struct kmem_cache_node *n = get_node(s, page_to_nid(page));



	atomic_long_dec(&n->nr_slabs);

	reset_page_mapcount(page);

	__ClearPageSlab(page);

	free_slab(s, page);

}