aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2008-05-14 19:05:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-14 22:11:14 -0400
commitfd8a4221ad76df700ff34875c9fbc42302aa4ba3 (patch)
tree4f37586cef40dca7cc8b630e85965a698e3aa1be /mm
parent3fc957721d18c93662f7d4dab455b80f53dd2641 (diff)
memory_hotplug: check for walk_memory_resource() failure in online_pages()
Add a check to online_pages() to test for failure of walk_memory_resource(). This fixes a condition where a failure of walk_memory_resource() can lead to online_pages() returning success without the requested pages being onlined. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Cc: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Dave Hansen <haveblue@us.ibm.com> Cc: Keith Mannthey <kmannth@us.ibm.com> Cc: Christoph Lameter <clameter@sgi.com> Cc: Paul Jackson <pj@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory_hotplug.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 988bd91b9f7f..656ad1c65422 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -404,8 +404,15 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
404 if (!populated_zone(zone)) 404 if (!populated_zone(zone))
405 need_zonelists_rebuild = 1; 405 need_zonelists_rebuild = 1;
406 406
407 walk_memory_resource(pfn, nr_pages, &onlined_pages, 407 ret = walk_memory_resource(pfn, nr_pages, &onlined_pages,
408 online_pages_range); 408 online_pages_range);
409 if (ret) {
410 printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
411 nr_pages, pfn);
412 memory_notify(MEM_CANCEL_ONLINE, &arg);
413 return ret;
414 }
415
409 zone->present_pages += onlined_pages; 416 zone->present_pages += onlined_pages;
410 zone->zone_pgdat->node_present_pages += onlined_pages; 417 zone->zone_pgdat->node_present_pages += onlined_pages;
411 418