diff options
| author | Matthew Wilcox <willy@infradead.org> | 2017-11-22 14:34:58 +0100 |
|---|---|---|
| committer | Matthew Wilcox <willy@infradead.org> | 2018-10-21 16:46:39 +0200 |
| commit | a12831bf4293d38518e41b80dd897af0122bb268 (patch) | |
| tree | b8760db3d1fa6cecfa3ec632808c7e7ebfc7cb02 | |
| parent | shmem: Convert shmem_radix_tree_replace to XArray (diff) | |
| download | linux-a12831bf4293d38518e41b80dd897af0122bb268.tar.xz linux-a12831bf4293d38518e41b80dd897af0122bb268.zip | |
shmem: Convert shmem_confirm_swap to XArray
xa_load has its own RCU locking, so we can eliminate it here.
Signed-off-by: Matthew Wilcox <willy@infradead.org>
| -rw-r--r-- | mm/shmem.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 5697c8fecdfc..ce91569426f3 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -349,12 +349,7 @@ static int shmem_replace_entry(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->i_pages, index); - rcu_read_unlock(); - return item == swp_to_radix_entry(swap); + return xa_load(&mapping->i_pages, index) == swp_to_radix_entry(swap); } /* |