btrfs: Convert page cache to XArray

Signed-off-by: Matthew Wilcox <willy@infradead.org>
Acked-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index fd25e125303c8914365184d28fbfdd07fad0a806..a65d144da00cd1794bc9659f4accc6d12132e9e5 100644 (file)
--- 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 fc7ca7d991ad5d567e42c109846cb0a8b3f1e6d8..d4ad015e44852e2d449ddad8a9c3ed70aa10eb8e 100644 (file)
--- 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);