diff options
| author | Matthew Wilcox <willy@infradead.org> | 2017-12-04 18:37:22 +0300 |
|---|---|---|
| committer | Matthew Wilcox <willy@infradead.org> | 2018-10-21 17:46:41 +0300 |
| commit | 0a943c65e7d7207dce2a63e9d14a925c0d9a7d96 (patch) | |
| tree | 1dc158564603ef4f4280e624b737821b243950e6 /fs | |
| parent | 7f4446eefe9fbbe68e9543946c9a20f67897ff9b (diff) | |
| download | linux-0a943c65e7d7207dce2a63e9d14a925c0d9a7d96.tar.xz | |
btrfs: Convert page cache to XArray
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Acked-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/compression.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/extent_io.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index fd25e125303c..a65d144da00c 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -437,9 +437,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, if (pg_index > end_index) break; - rcu_read_lock(); - page = radix_tree_lookup(&mapping->i_pages, pg_index); - rcu_read_unlock(); + page = xa_load(&mapping->i_pages, pg_index); if (page && !xa_is_value(page)) { misses++; if (misses > 4) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index fc7ca7d991ad..d4ad015e4485 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5153,11 +5153,9 @@ void clear_extent_buffer_dirty(struct extent_buffer *eb) clear_page_dirty_for_io(page); xa_lock_irq(&page->mapping->i_pages); - if (!PageDirty(page)) { - radix_tree_tag_clear(&page->mapping->i_pages, - page_index(page), - PAGECACHE_TAG_DIRTY); - } + if (!PageDirty(page)) + __xa_clear_mark(&page->mapping->i_pages, + page_index(page), PAGECACHE_TAG_DIRTY); xa_unlock_irq(&page->mapping->i_pages); ClearPageError(page); unlock_page(page); |