[058/181] i915: use find_lock_page instead of find_lock_entry

Commit Message

Andrew Morton Oct. 13, 2020, 11:51 p.m. UTC

From: "Matthew Wilcox (Oracle)" <[e-mail]>
Subject: 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.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Matthew Wilcox (Oracle) <[e-mail]>
Acked-by: Johannes Weiner <[e-mail]>
Cc: Alexey Dobriyan <[e-mail]>
Cc: Chris Wilson <[e-mail]>
Cc: Huang Ying <[e-mail]>
Cc: Hugh Dickins <[e-mail]>
Cc: Jani Nikula <[e-mail]>
Cc: Matthew Auld <[e-mail]>
Cc: William Kucharski <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 drivers/gpu/drm/i915/gem/i915_gem_shmem.c |    4 ++--
 include/linux/pagemap.h                   |    2 --
 mm/filemap.c                              |    1 -
 mm/internal.h                             |    3 +++
 4 files changed, 5 insertions(+), 5 deletions(-)

Patch

--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c~i915-use-find_lock_page-instead-of-find_lock_entry
+++ a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@ -258,8 +258,8 @@  shmem_writeback(struct drm_i915_gem_obje
 	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)) {
--- a/include/linux/pagemap.h~i915-use-find_lock_page-instead-of-find_lock_entry
+++ a/include/linux/pagemap.h
@@ -385,8 +385,6 @@  static inline struct page *find_subpage(
 	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);
--- a/mm/filemap.c~i915-use-find_lock_page-instead-of-find_lock_entry
+++ a/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.
--- a/mm/internal.h~i915-use-find_lock_page-instead-of-find_lock_entry
+++ a/mm/internal.h
@@ -65,6 +65,9 @@  static inline void ra_submit(struct file
 			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