[PATCH v4 51/73] btrfs: Convert page cache to XArray

[Matthew Wilcox]

From: Matthew Wilcox <mawil...@microsoft.com>

Signed-off-by: Matthew Wilcox <mawil...@microsoft.com>
---
 fs/btrfs/compression.c | 4 +---
 fs/btrfs/extent_io.c   | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index e687d06cd97c..4174b166e235 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -449,9 +449,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->pages, pg_index);
-               rcu_read_unlock();
+               page = xa_load(&mapping->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 b8b5b4562d50..96328c3a548e 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -5197,11 +5197,9 @@ void clear_extent_buffer_dirty(struct extent_buffer *eb)
 
                clear_page_dirty_for_io(page);
                xa_lock_irq(&page->mapping->pages);
-               if (!PageDirty(page)) {
-                       radix_tree_tag_clear(&page->mapping->pages,
-                                               page_index(page),
+               if (!PageDirty(page))
+                       __xa_clear_tag(&page->mapping->pages, page_index(page),
                                                PAGECACHE_TAG_DIRTY);
-               }
                xa_unlock_irq(&page->mapping->pages);
                ClearPageError(page);
                unlock_page(page);
-- 
2.15.0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html