diff options
| author | Matthew Wilcox <willy@infradead.org> | 2017-12-02 04:13:06 +0100 |
|---|---|---|
| committer | Matthew Wilcox <willy@infradead.org> | 2018-10-21 16:46:40 +0200 |
| commit | 7b8d046fba91d62beb8a8f78244aaa3c23a60cdd (patch) | |
| tree | 78f7d338690a358a6b67f5e153506feda90eb8bd /mm/shmem.c | |
| parent | shmem: Convert shmem_add_to_page_cache to XArray (diff) | |
| download | linux-7b8d046fba91d62beb8a8f78244aaa3c23a60cdd.tar.xz linux-7b8d046fba91d62beb8a8f78244aaa3c23a60cdd.zip | |
shmem: Convert shmem_alloc_hugepage to XArray
xa_find() is a slightly easier API to use than
radix_tree_gang_lookup_slot() because it contains its own RCU locking.
This commit removes the last user of radix_tree_gang_lookup_slot()
so remove the function too.
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Diffstat (limited to '')
| -rw-r--r-- | mm/shmem.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 8633bd3dc433..608c9252248f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1431,23 +1431,17 @@ static struct page *shmem_alloc_hugepage(gfp_t gfp, struct shmem_inode_info *info, pgoff_t index) { struct vm_area_struct pvma; - struct inode *inode = &info->vfs_inode; - struct address_space *mapping = inode->i_mapping; - pgoff_t idx, hindex; - void __rcu **results; + struct address_space *mapping = info->vfs_inode.i_mapping; + pgoff_t hindex; struct page *page; if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGE_PAGECACHE)) return NULL; hindex = round_down(index, HPAGE_PMD_NR); - rcu_read_lock(); - if (radix_tree_gang_lookup_slot(&mapping->i_pages, &results, &idx, - hindex, 1) && idx < hindex + HPAGE_PMD_NR) { - rcu_read_unlock(); + if (xa_find(&mapping->i_pages, &hindex, hindex + HPAGE_PMD_NR - 1, + XA_PRESENT)) return NULL; - } - rcu_read_unlock(); shmem_pseudo_vma_init(&pvma, info, hindex); page = alloc_pages_vma(gfp | __GFP_COMP | __GFP_NORETRY | __GFP_NOWARN, |