memory_hotplug: use pgdat_resize_lock() in __offline_pages()

mmzone.h documents node_size_lock (which pgdat_resize_lock() locks) as
follows:

        * Must be held any time you expect node_start_pfn, node_present_pages
        * or node_spanned_pages stay constant.  [...]

So actually hold it when we update node_present_pages in __offline_pages().

Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index a870d8071a3c1ec29a8a839af47d68e93deb3892..330b2c9826337ba9ec4bde07c7d828b9aec5b849 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1585,7 +1585,11 @@ repeat:
        /* removal success */
        zone->managed_pages -= offlined_pages;
        zone->present_pages -= offlined_pages;
+
+       pgdat_resize_lock(zone->zone_pgdat, &flags);
        zone->zone_pgdat->node_present_pages -= offlined_pages;
+       pgdat_resize_unlock(zone->zone_pgdat, &flags);
+
        totalram_pages -= offlined_pages;
 
        init_per_zone_wmark_min();