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

Commit 636f0d7d authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

SLUB: consolidate trace code 



Trace in both slab_alloc and slab_free has a lot of common code.  Use a single
function for both.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 35e5d7ee

mm/slub.c

+18 −13
Original line number Diff line number Diff line
@@ -805,6 +805,22 @@ static int free_object_checks(struct kmem_cache *s, struct page *page, 
	return 0;

}



static void trace(struct kmem_cache *s, struct page *page, void *object, int alloc)

{

	if (s->flags & SLAB_TRACE) {

		printk(KERN_INFO "TRACE %s %s 0x%p inuse=%d fp=0x%p\n",

			s->name,

			alloc ? "alloc" : "free",

			object, page->inuse,

			page->freelist);



		if (!alloc)

			print_section("Object", (void *)object, s->objsize);



		dump_stack();

	}

}



/*

 * Slab allocation and freeing

 */
@@ -1289,12 +1305,7 @@ static void *slab_alloc(struct kmem_cache *s, 
		goto another_slab;

	if (s->flags & SLAB_STORE_USER)

		set_track(s, object, TRACK_ALLOC, addr);

	if (s->flags & SLAB_TRACE) {

		printk(KERN_INFO "TRACE %s alloc 0x%p inuse=%d fp=0x%p\n",

			s->name, object, page->inuse,

			page->freelist);

		dump_stack();

	}

	trace(s, page, object, 1);

	init_object(s, object, 1);

	goto have_object;

}
@@ -1379,13 +1390,7 @@ static void slab_free(struct kmem_cache *s, struct page *page, 
		remove_full(s, page);

	if (s->flags & SLAB_STORE_USER)

		set_track(s, x, TRACK_FREE, addr);

	if (s->flags & SLAB_TRACE) {

		printk(KERN_INFO "TRACE %s free 0x%p inuse=%d fp=0x%p\n",

			s->name, object, page->inuse,

			page->freelist);

		print_section("Object", (void *)object, s->objsize);

		dump_stack();

	}

	trace(s, page, object, 0);

	init_object(s, object, 0);

	goto checks_ok;

}