HID: Add quirk for Microsoft PIXART OEM mouse

[sfrench/cifs-2.6.git] / mm / readahead.c

diff --git a/mm/readahead.c b/mm/readahead.c
index 4e630143a0ba8549c9a63f106c7dd18b7aaa4d18..f3d6f9656a3cc83c93420210dd938b8d0b54648e 100644 (file)
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -176,10 +176,8 @@ unsigned int __do_page_cache_readahead(struct address_space *mapping,
                if (page_offset > end_index)
                        break;
 
-               rcu_read_lock();
-               page = radix_tree_lookup(&mapping->i_pages, page_offset);
-               rcu_read_unlock();
-               if (page && !radix_tree_exceptional_entry(page)) {
+               page = xa_load(&mapping->i_pages, page_offset);
+               if (page && !xa_is_value(page)) {
                        /*
                         * Page already present?  Kick off the current batch of
                         * contiguous pages before continuing with the next
@@ -336,7 +334,7 @@ static pgoff_t count_history_pages(struct address_space *mapping,
        pgoff_t head;
 
        rcu_read_lock();
-       head = page_cache_prev_hole(mapping, offset - 1, max);
+       head = page_cache_prev_miss(mapping, offset - 1, max);
        rcu_read_unlock();
 
        return offset - 1 - head;
@@ -425,7 +423,7 @@ ondemand_readahead(struct address_space *mapping,
                pgoff_t start;
 
                rcu_read_lock();
-               start = page_cache_next_hole(mapping, offset + 1, max_pages);
+               start = page_cache_next_miss(mapping, offset + 1, max_pages);
                rcu_read_unlock();
 
                if (!start || start - offset > max_pages)