diff options
| author | Matthew Wilcox <willy@infradead.org> | 2017-12-04 09:13:54 +0100 |
|---|---|---|
| committer | Matthew Wilcox <willy@infradead.org> | 2018-10-21 16:46:40 +0200 |
| commit | c121d3bb717ee932caf031c6a7923547f7f83163 (patch) | |
| tree | 507bb4c1860a43c73b5b7d383a797c77c3b9c3ed /mm | |
| parent | shmem: Convert shmem_alloc_hugepage to XArray (diff) | |
| download | linux-c121d3bb717ee932caf031c6a7923547f7f83163.tar.xz linux-c121d3bb717ee932caf031c6a7923547f7f83163.zip | |
shmem: Convert shmem_free_swap to XArray
Since we are conditionally storing NULL in the XArray, we do not need
to allocate memory and the GFP flags will be unused.
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 608c9252248f..8e9bbfb7ed15 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -650,7 +650,7 @@ 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) @@ -658,7 +658,7 @@ static int shmem_free_swap(struct address_space *mapping, void *old; xa_lock_irq(&mapping->i_pages); - old = radix_tree_delete_item(&mapping->i_pages, index, radswap); + old = __xa_cmpxchg(&mapping->i_pages, index, radswap, NULL, 0); xa_unlock_irq(&mapping->i_pages); if (old != radswap) return -ENOENT; |