From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: linux-mm@kvack.org, David Rientjes <rientjes@google.com>
Subject: [Slub cleanup6 5/5] slub: Move debug handlign in __slab_free
Date: Fri, 15 Apr 2011 14:48:16 -0500 [thread overview]
Message-ID: <20110415194832.574871056@linux.com> (raw)
In-Reply-To: 20110415194811.810587216@linux.com
[-- Attachment #1: move_debug --]
[-- Type: text/plain, Size: 1273 bytes --]
Its easier to read if its with the check for debugging flags.
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slub.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2011-04-15 12:54:21.000000000 -0500
+++ linux-2.6/mm/slub.c 2011-04-15 12:54:21.000000000 -0500
@@ -2057,10 +2057,9 @@ static void __slab_free(struct kmem_cach
slab_lock(page);
stat(s, FREE_SLOWPATH);
- if (kmem_cache_debug(s))
- goto debug;
+ if (kmem_cache_debug(s) && !free_debug_processing(s, page, x, addr))
+ goto out_unlock;
-checks_ok:
prior = page->freelist;
set_freepointer(s, object, prior);
page->freelist = object;
@@ -2104,12 +2103,6 @@ slab_empty:
#endif
stat(s, FREE_SLAB);
discard_slab(s, page);
- return;
-
-debug:
- if (!free_debug_processing(s, page, x, addr))
- goto out_unlock;
- goto checks_ok;
}
/*
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-04-15 19:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-15 19:48 [Slub cleanup6 0/5] SLUB: Cleanups V6 Christoph Lameter
2011-04-15 19:48 ` [Slub cleanup6 1/5] slub: Use NUMA_NO_NODE in get_partial Christoph Lameter
2011-05-11 20:03 ` David Rientjes
2011-04-15 19:48 ` [Slub cleanup6 2/5] slub: get_map() function to establish map of free objects in a slab Christoph Lameter
2011-05-11 20:03 ` David Rientjes
2011-05-12 16:41 ` Christoph Lameter
2011-05-12 20:01 ` David Rientjes
2011-04-15 19:48 ` [Slub cleanup6 3/5] slub: Eliminate repeated use of c->page through a new page variable Christoph Lameter
2011-05-11 20:03 ` David Rientjes
2011-04-15 19:48 ` [Slub cleanup6 4/5] slub: Move node determination out of hotpath Christoph Lameter
2011-05-11 20:03 ` David Rientjes
2011-05-12 16:44 ` Christoph Lameter
2011-05-12 20:10 ` [patch] slub: avoid label inside conditional David Rientjes
2011-05-13 14:49 ` Christoph Lameter
2011-04-15 19:48 ` Christoph Lameter [this message]
2011-05-11 20:03 ` [Slub cleanup6 5/5] slub: Move debug handlign in __slab_free David Rientjes
2011-04-17 11:05 ` [Slub cleanup6 0/5] SLUB: Cleanups V6 Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110415194832.574871056@linux.com \
--to=cl@linux.com \
--cc=linux-mm@kvack.org \
--cc=penberg@cs.helsinki.fi \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).