From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Hugh Dickins <hughd@google.com>,
William Kucharski <william.kucharski@oracle.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
Alexey Dobriyan <adobriyan@gmail.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Chris Wilson <chris@chris-wilson.co.uk>,
Matthew Auld <matthew.auld@intel.com>,
Huang Ying <ying.huang@intel.com>,
intel-gfx@lists.freedesktop.org, cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/8] i915: Use find_lock_page instead of find_lock_entry
Date: Wed, 19 Aug 2020 19:48:47 +0100 [thread overview]
Message-ID: <20200819184850.24779-6-willy@infradead.org> (raw)
In-Reply-To: <20200819184850.24779-1-willy@infradead.org>
i915 does not want to see value entries. Switch it to use
find_lock_page() instead, and remove the export of find_lock_entry().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 ++--
mm/filemap.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index 38113d3c0138..75e8b71c18b9 100644
--- 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/mm/filemap.c b/mm/filemap.c
index 1aaea26556cc..36067cf7f8c5 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1628,7 +1628,6 @@ struct page *find_lock_entry(struct address_space *mapping, pgoff_t offset)
}
return page;
}
-EXPORT_SYMBOL(find_lock_entry);
/**
* pagecache_get_page - Find and get a reference to a page.
--
2.28.0
next prev parent reply other threads:[~2020-08-19 18:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-19 18:48 [PATCH 0/8] Return head pages from find_get_entry and find_lock_entry Matthew Wilcox (Oracle)
2020-08-19 18:48 ` [PATCH 1/8] mm: Factor find_get_swap_page out of mincore_page Matthew Wilcox (Oracle)
2020-08-19 19:21 ` Matthew Wilcox
2020-08-19 18:48 ` [PATCH 2/8] mm: Use find_get_swap_page in memcontrol Matthew Wilcox (Oracle)
2020-08-26 14:20 ` Johannes Weiner
2020-08-26 14:54 ` Matthew Wilcox
2020-08-26 16:26 ` Johannes Weiner
2020-08-27 12:59 ` Matthew Wilcox
2020-08-27 14:22 ` Johannes Weiner
2020-08-19 18:48 ` [PATCH 3/8] mm: Optimise madvise WILLNEED Matthew Wilcox (Oracle)
2020-08-26 14:23 ` Johannes Weiner
2020-08-19 18:48 ` [PATCH 4/8] proc: Optimise smaps for shmem entries Matthew Wilcox (Oracle)
2020-08-26 14:24 ` Johannes Weiner
2020-08-19 18:48 ` Matthew Wilcox (Oracle) [this message]
2020-08-26 14:27 ` [PATCH 5/8] i915: Use find_lock_page instead of find_lock_entry Johannes Weiner
2020-08-19 18:48 ` [PATCH 6/8] mm: Convert find_get_entry to return the head page Matthew Wilcox (Oracle)
2020-08-26 15:09 ` Johannes Weiner
2020-08-26 15:48 ` Matthew Wilcox
2020-08-19 18:48 ` [PATCH 7/8] mm: Return head page from find_lock_entry Matthew Wilcox (Oracle)
2020-08-19 18:48 ` [PATCH 8/8] mm: Hoist find_subpage call further up in pagecache_get_page Matthew Wilcox (Oracle)
2020-08-21 17:37 ` [PATCH 0/8] Return head pages from find_get_entry and find_lock_entry William Kucharski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200819184850.24779-6-willy@infradead.org \
--to=willy@infradead.org \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=chris@chris-wilson.co.uk \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=matthew.auld@intel.com \
--cc=william.kucharski@oracle.com \
--cc=ying.huang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).