From: cl@linux.com
From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: linux-mm@kvack.org, David Rientjes <rientjes@google.com>
Subject: [Slub cleanup 4/9] slub: Simplify control flow in __slab_alloc()
Date: Wed, 09 May 2012 10:09:54 -0500 [thread overview]
Message-ID: <20120509151009.038672442@linux.com> (raw)
In-Reply-To: 20120509150950.243797150@linux.com
[-- Attachment #1: control_flow_simplify --]
[-- Type: text/plain, Size: 1376 bytes --]
Simplify control flow a bit avoiding nesting.
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slub.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-04-10 10:33:01.818750910 -0500
+++ linux-2.6/mm/slub.c 2012-04-10 10:33:06.910750804 -0500
@@ -2272,17 +2272,15 @@ new_slab:
/* Then do expensive stuff like retrieving pages from the partial lists */
freelist = get_partial(s, gfpflags, node, c);
- if (unlikely(!freelist)) {
-
+ if (!freelist)
freelist = new_slab_objects(s, gfpflags, node, &c);
- if (unlikely(!freelist)) {
- if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
- slab_out_of_memory(s, gfpflags, node);
+ if (unlikely(!freelist)) {
+ if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
+ slab_out_of_memory(s, gfpflags, node);
- local_irq_restore(flags);
- return NULL;
- }
+ local_irq_restore(flags);
+ return NULL;
}
if (likely(!kmem_cache_debug(s)))
--
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:[~2012-05-09 15:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 15:09 [Slub cleanup 0/9] Slub: cleanups V2 cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 1/9] slub: Use freelist instead of "object" in __slab_alloc cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 2/9] slub: Add frozen check " cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 3/9] slub: Acquire_slab() avoid loop cl, Christoph Lameter
2012-05-09 15:09 ` cl, Christoph Lameter [this message]
2012-05-09 15:09 ` [Slub cleanup 5/9] slub: new_slab_objects() can also get objects from partial list cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 6/9] slub: Get rid of the node field cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 7/9] slub: Separate out kmem_cache_cpu processing from deactivate_slab cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 8/9] slub: Use page variable instead of c->page cl, Christoph Lameter
2012-05-09 15:09 ` [Slub cleanup 9/9] slub: pass page to node_match() instead of kmem_cache_cpu structure cl, Christoph Lameter
-- strict thread matches above, loose matches on Subject: below --
2012-01-23 20:16 [Slub cleanup 0/9] Slub: cleanups V1 Christoph Lameter
2012-01-23 20:16 ` [Slub cleanup 4/9] slub: Simplify control flow in __slab_alloc() Christoph Lameter
2012-02-01 22:02 ` David Rientjes
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=20120509151009.038672442@linux.com \
--to=cl@linux.com \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.