radix-tree: improve multiorder iterators

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

diff --git a/mm/shmem.c b/mm/shmem.c
index 9d32e1cb9f38f7dd508f1be0273d0721974b2c05..be11c6dd414aada7bf41822e7b0a3a55f77339a0 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -300,18 +300,19 @@ void shmem_uncharge(struct inode *inode, long pages)
 static int shmem_radix_tree_replace(struct address_space *mapping,
                        pgoff_t index, void *expected, void *replacement)
 {
+       struct radix_tree_node *node;
        void **pslot;
        void *item;
 
        VM_BUG_ON(!expected);
        VM_BUG_ON(!replacement);
-       pslot = radix_tree_lookup_slot(&mapping->page_tree, index);
-       if (!pslot)
+       item = __radix_tree_lookup(&mapping->page_tree, index, &node, &pslot);
+       if (!item)
                return -ENOENT;
-       item = radix_tree_deref_slot_protected(pslot, &mapping->tree_lock);
        if (item != expected)
                return -ENOENT;
-       radix_tree_replace_slot(pslot, replacement);
+       __radix_tree_replace(&mapping->page_tree, node, pslot,
+                            replacement, NULL, NULL);
        return 0;
 }
 
@@ -370,6 +371,7 @@ static bool shmem_confirm_swap(struct address_space *mapping,
 
 int shmem_huge __read_mostly;
 
+#if defined(CONFIG_SYSFS) || defined(CONFIG_TMPFS)
 static int shmem_parse_huge(const char *str)
 {
        if (!strcmp(str, "never"))
@@ -407,6 +409,7 @@ static const char *shmem_format_huge(int huge)
                return "bad_val";
        }
 }
+#endif
 
 static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo,
                struct shrink_control *sc, unsigned long nr_to_split)
@@ -658,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);
                }
        }
 
@@ -1539,7 +1542,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
        struct mm_struct *fault_mm, int *fault_type)
 {
        struct address_space *mapping = inode->i_mapping;
-       struct shmem_inode_info *info;
+       struct shmem_inode_info *info = SHMEM_I(inode);
        struct shmem_sb_info *sbinfo;
        struct mm_struct *charge_mm;
        struct mem_cgroup *memcg;
@@ -1589,7 +1592,6 @@ repeat:
         * Fast cache lookup did not find it:
         * bring it back from swap or allocate.
         */
-       info = SHMEM_I(inode);
        sbinfo = SHMEM_SB(inode->i_sb);
        charge_mm = fault_mm ? : current->mm;
 
@@ -1837,7 +1839,6 @@ unlock:
                put_page(page);
        }
        if (error == -ENOSPC && !once++) {
-               info = SHMEM_I(inode);
                spin_lock_irq(&info->lock);
                shmem_recalc_inode(inode);
                spin_unlock_irq(&info->lock);
@@ -2446,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();
@@ -2516,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();