On Wed, 11 May 2011, David Rientjes wrote:
> I'd much prefer to just add a
>
> c->node = page_to_nid(page);
>
> rather than the new label and goto into a conditional.
>
> > }
> > if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
> > slab_out_of_memory(s, gfpflags, node);
>
Hmmm... Looks like we also missed to use the label.
Subject: slub: Fix control flow in slab_alloc
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
---
mm/slub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2011-05-12 11:41:44.000000000 -0500
+++ linux-2.6/mm/slub.c 2011-05-12 11:42:25.000000000 -0500
@@ -1833,7 +1833,6 @@ new_slab:
page = get_partial(s, gfpflags, node);
if (page) {
stat(s, ALLOC_FROM_PARTIAL);
-load_from_page:
c->node = page_to_nid(page);
c->page = page;
goto load_freelist;
@@ -1856,6 +1855,7 @@ load_from_page:
slab_lock(page);
__SetPageSlubFrozen(page);
+ c->node = page_to_nid(page);
c->page = page;
goto load_freelist;
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxxx 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@xxxxxxxxx";> email@xxxxxxxxx </a>