radix-tree: improve multiorder iterators

[karo-tx-linux.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index abd7403aba41f0001e6724c640f5e4095a63c142..be11c6dd414aada7bf41822e7b0a3a55f77339a0 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -661,8 +661,8 @@ unsigned long shmem_partial_swap_usage(struct address_space *mapping,
                        swapped++;
 
                if (need_resched()) {
+                       slot = radix_tree_iter_resume(slot, &iter);
                        cond_resched_rcu();
-                       slot = radix_tree_iter_next(&iter);
                }
        }
 
@@ -2447,8 +2447,8 @@ static void shmem_tag_pins(struct address_space *mapping)
                }
 
                if (need_resched()) {
+                       slot = radix_tree_iter_resume(slot, &iter);
                        cond_resched_rcu();
-                       slot = radix_tree_iter_next(&iter);
                }
        }
        rcu_read_unlock();
@@ -2517,8 +2517,8 @@ static int shmem_wait_for_pins(struct address_space *mapping)
                        spin_unlock_irq(&mapping->tree_lock);
 continue_resched:
                        if (need_resched()) {
+                               slot = radix_tree_iter_resume(slot, &iter);
                                cond_resched_rcu();
-                               slot = radix_tree_iter_next(&iter);
                        }
                }
                rcu_read_unlock();