Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
[linux-2.6-block.git] / fs / buffer.c
index af0d9a82a8edff4dd279657a56757cb76588e2f0..754813a6962bc324c476b5d5035f10e761c1e28c 100644 (file)
@@ -255,17 +255,17 @@ out:
  */
 static void free_more_memory(void)
 {
-       struct zone *zone;
+       struct zoneref *z;
        int nid;
 
        wakeup_flusher_threads(1024, WB_REASON_FREE_MORE_MEM);
        yield();
 
        for_each_online_node(nid) {
-               (void)first_zones_zonelist(node_zonelist(nid, GFP_NOFS),
-                                               gfp_zone(GFP_NOFS), NULL,
-                                               &zone);
-               if (zone)
+
+               z = first_zones_zonelist(node_zonelist(nid, GFP_NOFS),
+                                               gfp_zone(GFP_NOFS), NULL);
+               if (z->zone)
                        try_to_free_pages(node_zonelist(nid, GFP_NOFS), 0,
                                                GFP_NOFS, NULL);
        }