[v6,42/99] shmem: Convert shmem_confirm_swap to XArray
From: Matthew Wilcox <willy@infradead.org>
Date: 2018-01-17 20:21:06
Also in:
cgroups, intel-gfx, linux-f2fs-devel, linux-fsdevel, linux-iommu, linux-mm, linux-remoteproc, linux-s390, linux-sh, linux-xfs, lkml
Subsystem:
memory management, the rest, tmpfs (shmem filesystem) · Maintainers:
Andrew Morton, Linus Torvalds, Hugh Dickins
From: Matthew Wilcox <redacted> xa_load has its own RCU locking, so we can eliminate it here. Signed-off-by: Matthew Wilcox <redacted> --- mm/shmem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index fad6c9e7402e..654f367aca90 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c@@ -348,12 +348,7 @@ static int shmem_xa_replace(struct address_space *mapping, static bool shmem_confirm_swap(struct address_space *mapping, pgoff_t index, swp_entry_t swap) { - void *item; - - rcu_read_lock(); - item = radix_tree_lookup(&mapping->pages, index); - rcu_read_unlock(); - return item == swp_to_radix_entry(swap); + return xa_load(&mapping->pages, index) == swp_to_radix_entry(swap); } /*