Skip to content

Commit 9dfc8ff

Browse files
Matthew Wilcox (Oracle)torvalds
authored andcommitted
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>
1 parent 8cf8864 commit 9dfc8ff

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ shmem_writeback(struct drm_i915_gem_object *obj)
258258
for (i = 0; i < obj->base.size >> PAGE_SHIFT; i++) {
259259
struct page *page;
260260

261-
page = find_lock_entry(mapping, i);
262-
if (!page || xa_is_value(page))
261+
page = find_lock_page(mapping, i);
262+
if (!page)
263263
continue;
264264

265265
if (!page_mapped(page) && clear_page_dirty_for_io(page)) {

include/linux/pagemap.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,6 @@ static inline struct page *find_subpage(struct page *head, pgoff_t index)
385385
return head + (index & (thp_nr_pages(head) - 1));
386386
}
387387

388-
struct page *find_get_entry(struct address_space *mapping, pgoff_t offset);
389-
struct page *find_lock_entry(struct address_space *mapping, pgoff_t offset);
390388
unsigned find_get_entries(struct address_space *mapping, pgoff_t start,
391389
unsigned int nr_entries, struct page **entries,
392390
pgoff_t *indices);

mm/filemap.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,6 @@ struct page *find_lock_entry(struct address_space *mapping, pgoff_t offset)
17261726
}
17271727
return page;
17281728
}
1729-
EXPORT_SYMBOL(find_lock_entry);
17301729

17311730
/**
17321731
* pagecache_get_page - Find and get a reference to a page.

mm/internal.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ static inline void ra_submit(struct file_ra_state *ra,
6565
ra->start, ra->size, ra->async_size);
6666
}
6767

68+
struct page *find_get_entry(struct address_space *mapping, pgoff_t index);
69+
struct page *find_lock_entry(struct address_space *mapping, pgoff_t index);
70+
6871
/**
6972
* page_evictable - test whether a page is evictable
7073
* @page: the page to test

0 commit comments

Comments
 (0)