i915: use find_lock_page instead of find_lock_entry

i915 does not want to see value entries.  Switch it to use
find_lock_page() instead, and remove the export of find_lock_entry().
Move find_lock_entry() and find_get_entry() to mm/internal.h to discourage
any future use.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: William Kucharski <william.kucharski@oracle.com>
Link: https://lkml.kernel.org/r/20200910183318.20139-6-willy@infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index 38113d3c0138e915f78950f60190aa65d7e6dbde..75e8b71c18b9254bd8aeb423016409a5a2d61b19 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@ -258,8 +258,8 @@ shmem_writeback(struct drm_i915_gem_object *obj)
        for (i = 0; i < obj->base.size >> PAGE_SHIFT; i++) {
                struct page *page;
 
-               page = find_lock_entry(mapping, i);
-               if (!page || xa_is_value(page))
+               page = find_lock_page(mapping, i);
+               if (!page)
                        continue;
 
                if (!page_mapped(page) && clear_page_dirty_for_io(page)) {

diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 434c9c34aeb6e12df15942f1272587f7ad087cc8..9d282fe6700d77bb097497fe181df1fb1ceb0d90 100644 (file)
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -385,8 +385,6 @@ static inline struct page *find_subpage(struct page *head, pgoff_t index)
        return head + (index & (thp_nr_pages(head) - 1));
 }
 
-struct page *find_get_entry(struct address_space *mapping, pgoff_t offset);
-struct page *find_lock_entry(struct address_space *mapping, pgoff_t offset);
 unsigned find_get_entries(struct address_space *mapping, pgoff_t start,
                          unsigned int nr_entries, struct page **entries,
                          pgoff_t *indices);

diff --git a/mm/filemap.c b/mm/filemap.c
index 748b7b1b4f6d84fffd97fd8cd702f0e2e166e688..089a2f02067f371e4e380bf32ab96daf1524ad3c 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1726,7 +1726,6 @@ repeat:
        }
        return page;
 }
-EXPORT_SYMBOL(find_lock_entry);
 
 /**
  * pagecache_get_page - Find and get a reference to a page.

diff --git a/mm/internal.h b/mm/internal.h
index 10c677655912aedf246ea4356dbec4b16164cd53..a801a4d51f260bca0f51b6a798c048bf2eb6875b 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -65,6 +65,9 @@ static inline void ra_submit(struct file_ra_state *ra,
                        ra->start, ra->size, ra->async_size);
 }
 
+struct page *find_get_entry(struct address_space *mapping, pgoff_t index);
+struct page *find_lock_entry(struct address_space *mapping, pgoff_t index);
+
 /**
  * page_evictable - test whether a page is evictable
  * @page: the page to test