diff options
| author |   Matthew Wilcox <willy@infradead.org> | 2017-11-17 10:01:45 -0500 |
|---|---|---|
| committer | Matthew Wilcox <willy@infradead.org> | 2018-10-21 10:46:33 -0400 |
| commit | 74d609585d8bd6083bd9d75bc1fd2c0d3851bcc5 (patch) | |
| tree | 21b2c29ac80af601c6cdfcea2452fc2b9c00f617 /include | |
| parent | page cache: Convert hole search to XArray (diff) | |
| download | linux-dev-74d609585d8bd6083bd9d75bc1fd2c0d3851bcc5.tar.xz linux-dev-74d609585d8bd6083bd9d75bc1fd2c0d3851bcc5.zip | |
page cache: Add and replace pages using the XArray
Use the XArray APIs to add and replace pages in the page cache. This
removes two uses of the radix tree preload API and is significantly
shorter code. It also removes the last user of __radix_tree_create()
outside radix-tree.c itself, so make it static.
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/radix-tree.h | 3 | ||||
| -rw-r--r-- | include/linux/swap.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index 15388b7e38b9..d55de428a589 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -231,9 +231,6 @@ static inline int radix_tree_exception(void *arg) return unlikely((unsigned long)arg & RADIX_TREE_ENTRY_MASK); } -int __radix_tree_create(struct radix_tree_root *, unsigned long index, - unsigned order, struct radix_tree_node **nodep, - void __rcu ***slotp); int __radix_tree_insert(struct radix_tree_root *, unsigned long index, unsigned order, void *); static inline int radix_tree_insert(struct radix_tree_root *root, diff --git a/include/linux/swap.h b/include/linux/swap.h index 8e2c11e692ba..6ea50cf41b4c 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -299,8 +299,12 @@ void *workingset_eviction(struct address_space *mapping, struct page *page); bool workingset_refault(void *shadow); void workingset_activation(struct page *page); -/* Do not use directly, use workingset_lookup_update */ -void workingset_update_node(struct radix_tree_node *node); +/* Only track the nodes of mappings with shadow entries */ +void workingset_update_node(struct xa_node *node); +#define mapping_set_update(xas, mapping) do { \ + if (!dax_mapping(mapping) && !shmem_mapping(mapping)) \ + xas_set_update(xas, workingset_update_node); \ +} while (0) /* Returns workingset_update_node() if the mapping has shadow entries. */ #define workingset_lookup_update(mapping) \ |