Merge branch 'fscache' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus

3 files changed, 15 insertions, 14 deletions

diff --git a/mm/highmem.c b/mm/highmem.c
index d999077431d..b32b70cdaed 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -105,6 +105,7 @@ struct page *kmap_to_page(void *vaddr)
 
         return virt_to_page(addr);
 }
+EXPORT_SYMBOL(kmap_to_page);
 
 static void flush_all_zero_pkmaps(void)
 {
diff --git a/mm/ksm.c b/mm/ksm.c
index 82dfb4b5432..51573858938 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1624,7 +1624,7 @@ again:
                 struct anon_vma_chain *vmac;
                 struct vm_area_struct *vma;
 
-                anon_vma_lock_write(anon_vma);
+                anon_vma_lock_read(anon_vma);
                 anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root,
                                                0, ULONG_MAX) {
                         vma = vmac->vma;
@@ -1648,7 +1648,7 @@ again:
                         if (!search_new_forks || !mapcount)
                                 break;
                 }
-                anon_vma_unlock(anon_vma);
+                anon_vma_unlock_read(anon_vma);
                 if (!mapcount)
                         goto out;
         }
@@ -1678,7 +1678,7 @@ again:
                 struct anon_vma_chain *vmac;
                 struct vm_area_struct *vma;
 
-                anon_vma_lock_write(anon_vma);
+                anon_vma_lock_read(anon_vma);
                 anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root,
                                                0, ULONG_MAX) {
                         vma = vmac->vma;
@@ -1697,11 +1697,11 @@ again:
                         ret = try_to_unmap_one(page, vma,
                                         rmap_item->address, flags);
                         if (ret != SWAP_AGAIN || !page_mapped(page)) {
-                                anon_vma_unlock(anon_vma);
+                                anon_vma_unlock_read(anon_vma);
                                 goto out;
                         }
                 }
-                anon_vma_unlock(anon_vma);
+                anon_vma_unlock_read(anon_vma);
         }
         if (!search_new_forks++)
                 goto again;
@@ -1731,7 +1731,7 @@ again:
                 struct anon_vma_chain *vmac;
                 struct vm_area_struct *vma;
 
-                anon_vma_lock_write(anon_vma);
+                anon_vma_lock_read(anon_vma);
                 anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root,
                                                0, ULONG_MAX) {
                         vma = vmac->vma;
@@ -1749,11 +1749,11 @@ again:
 
                         ret = rmap_one(page, vma, rmap_item->address, arg);
                         if (ret != SWAP_AGAIN) {
-                                anon_vma_unlock(anon_vma);
+                                anon_vma_unlock_read(anon_vma);
                                 goto out;
                         }
                 }
-                anon_vma_unlock(anon_vma);
+                anon_vma_unlock_read(anon_vma);
         }
         if (!search_new_forks++)
                 goto again;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 828530e2794..adc7e905818 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2570,7 +2570,7 @@ static bool prepare_kswapd_sleep(pg_data_t *pgdat, int order, long remaining,
 static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
                                                         int *classzone_idx)
 {
-        int all_zones_ok;
+        struct zone *unbalanced_zone;
         unsigned long balanced;
         int i;
         int end_zone = 0;       /* Inclusive.  0 = ZONE_DMA */
@@ -2604,7 +2604,7 @@ loop_again:
                 unsigned long lru_pages = 0;
                 int has_under_min_watermark_zone = 0;
 
-                all_zones_ok = 1;
+                unbalanced_zone = NULL;
                 balanced = 0;
 
                 /*
@@ -2743,7 +2743,7 @@ loop_again:
                         }
 
                         if (!zone_balanced(zone, testorder, 0, end_zone)) {
-                                all_zones_ok = 0;
+                                unbalanced_zone = zone;
                                 /*
                                  * We are still under min water mark.  This
                                  * means that we have a GFP_ATOMIC allocation
@@ -2776,7 +2776,7 @@ loop_again:
                                 pfmemalloc_watermark_ok(pgdat))
                         wake_up(&pgdat->pfmemalloc_wait);
 
-                if (all_zones_ok || (order && pgdat_balanced(pgdat, balanced, *classzone_idx)))
+                if (!unbalanced_zone || (order && pgdat_balanced(pgdat, balanced, *classzone_idx)))
                         break;          /* kswapd: all done */
                 /*
                  * OK, kswapd is getting into trouble.  Take a nap, then take
@@ -2786,7 +2786,7 @@ loop_again:
                         if (has_under_min_watermark_zone)
                                 count_vm_event(KSWAPD_SKIP_CONGESTION_WAIT);
                         else
-                                congestion_wait(BLK_RW_ASYNC, HZ/10);
+                                wait_iff_congested(unbalanced_zone, BLK_RW_ASYNC, HZ/10);
                 }
 
                 /*
@@ -2805,7 +2805,7 @@ out:
          * high-order: Balanced zones must make up at least 25% of the node
          *             for the node to be balanced
          */
-        if (!(all_zones_ok || (order && pgdat_balanced(pgdat, balanced, *classzone_idx)))) {
+        if (unbalanced_zone && (!order || !pgdat_balanced(pgdat, balanced, *classzone_idx))) {
                 cond_resched();
 
                 try_to_freeze();