[PATCH v5 49/78] shmem: Convert shmem_free_swap to XArray
From: Matthew Wilcox <willy@infradead.org>
Date: 2017-12-15 22:04:21
Also in:
linux-f2fs-devel, linux-fsdevel, linux-mm, linux-usb, linux-xfs, lkml
Subsystem:
memory management, the rest, tmpfs (shmem filesystem) · Maintainers:
Andrew Morton, Linus Torvalds, Hugh Dickins
From: Matthew Wilcox <redacted> This is a perfect use for xa_cmpxchg(). Note the use of 0 for GFP flags; we won't be allocating memory. Signed-off-by: Matthew Wilcox <redacted> --- mm/shmem.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index bd66bbd40499..dd663341e01e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c@@ -635,16 +635,13 @@ static void shmem_delete_from_page_cache(struct page *page, void *radswap) } /* - * Remove swap entry from radix tree, free the swap and its page cache. + * Remove swap entry from page cache, free the swap and its page cache. */ static int shmem_free_swap(struct address_space *mapping, pgoff_t index, void *radswap) { - void *old; + void *old = xa_cmpxchg(&mapping->pages, index, radswap, NULL, 0); - xa_lock_irq(&mapping->pages); - old = radix_tree_delete_item(&mapping->pages, index, radswap); - xa_unlock_irq(&mapping->pages); if (old != radswap) return -ENOENT; free_swap_and_cache(radix_to_swp_entry(radswap));
--
2.15.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot