diff options
author | 2018-05-16 17:20:45 -0400 | |
---|---|---|
committer | 2018-10-21 10:46:34 -0400 | |
commit | f280bf092d48ff2db12b4a01127cd855c9e0ffb0 (patch) | |
tree | 6ef36bb2c3ce48f5f1f9277c2852cf1a620f1439 | |
parent | page cache: Convert find_get_entry to XArray (diff) | |
download | linux-f280bf092d48ff2db12b4a01127cd855c9e0ffb0.tar.gz linux-f280bf092d48ff2db12b4a01127cd855c9e0ffb0.tar.bz2 linux-f280bf092d48ff2db12b4a01127cd855c9e0ffb0.zip |
page cache: Convert find_get_entries to XArray
Slightly shorter and simpler code.
Signed-off-by: Matthew Wilcox <willy@infradead.org>
-rw-r--r-- | mm/filemap.c | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 2bf9f0742082..4707156b9fbd 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1578,53 +1578,48 @@ unsigned find_get_entries(struct address_space *mapping, pgoff_t start, unsigned int nr_entries, struct page **entries, pgoff_t *indices) { - void **slot; + XA_STATE(xas, &mapping->i_pages, start); + struct page *page; unsigned int ret = 0; - struct radix_tree_iter iter; if (!nr_entries) return 0; rcu_read_lock(); - radix_tree_for_each_slot(slot, &mapping->i_pages, &iter, start) { - struct page *head, *page; -repeat: - page = radix_tree_deref_slot(slot); - if (unlikely(!page)) + xas_for_each(&xas, page, ULONG_MAX) { + struct page *head; + if (xas_retry(&xas, page)) continue; - if (radix_tree_exception(page)) { - if (radix_tree_deref_retry(page)) { - slot = radix_tree_iter_retry(&iter); - continue; - } - /* - * A shadow entry of a recently evicted page, a swap - * entry from shmem/tmpfs or a DAX entry. Return it - * without attempting to raise page count. - */ + /* + * A shadow entry of a recently evicted page, a swap + * entry from shmem/tmpfs or a DAX entry. Return it + * without attempting to raise page count. + */ + if (xa_is_value(page)) goto export; - } head = compound_head(page); if (!page_cache_get_speculative(head)) - goto repeat; + goto retry; /* The page was split under us? */ - if (compound_head(page) != head) { - put_page(head); - goto repeat; - } + if (compound_head(page) != head) + goto put_page; /* Has the page moved? */ - if (unlikely(page != *slot)) { - put_page(head); - goto repeat; - } + if (unlikely(page != xas_reload(&xas))) + goto put_page; + export: - indices[ret] = iter.index; + indices[ret] = xas.xa_index; entries[ret] = page; if (++ret == nr_entries) break; + continue; +put_page: + put_page(head); +retry: + xas_reset(&xas); } rcu_read_unlock(); return ret; |