1 files changed, 12 insertions, 8 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 39ff14403d13..3db4a26adc44 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -360,16 +360,19 @@ void invalidate_bdev(struct block_device *bdev)
  */
 static void free_more_memory(void)
 {
-        struct zone **zones;
-        pg_data_t *pgdat;
+        struct zone *zone;
+        int nid;
 
         wakeup_pdflush(1024);
         yield();
 
-        for_each_online_pgdat(pgdat) {
-                zones = pgdat->node_zonelists[gfp_zone(GFP_NOFS)].zones;
-                if (*zones)
-                        try_to_free_pages(zones, 0, GFP_NOFS);
+        for_each_online_node(nid) {
+                (void)first_zones_zonelist(node_zonelist(nid, GFP_NOFS),
+                                                gfp_zone(GFP_NOFS), NULL,
+                                                &zone);
+                if (zone)
+                        try_to_free_pages(node_zonelist(nid, GFP_NOFS), 0,
+                                                GFP_NOFS);
         }
 }
 
@@ -2243,6 +2246,8 @@ int cont_expand_zero(struct file *file, struct address_space *mapping,
                         goto out;
                 BUG_ON(err != len);
                 err = 0;
+
+                balance_dirty_pages_ratelimited(mapping);
         }
 
         /* page covers the boundary, find the boundary offset */
@@ -3180,8 +3185,7 @@ static void recalc_bh_state(void)
         
 struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
 {
-        struct buffer_head *ret = kmem_cache_alloc(bh_cachep,
-                                set_migrateflags(gfp_flags, __GFP_RECLAIMABLE));
+        struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags);
         if (ret) {
                 INIT_LIST_HEAD(&ret->b_assoc_buffers);
                 get_cpu_var(bh_accounting).nr++;