f2fs: Convert to XArray

This is a straightforward conversion.

Signed-off-by: Matthew Wilcox <willy@infradead.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5b760809eecccbe4b644ed8176ce226a56cecb31..6962491172a5d47ebc301974c7bc458df1637707 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2697,13 +2697,13 @@ const struct address_space_operations f2fs_dblock_aops = {
 #endif
 };
 
-void f2fs_clear_radix_tree_dirty_tag(struct page *page)
+void f2fs_clear_page_cache_dirty_tag(struct page *page)
 {
        struct address_space *mapping = page_mapping(page);
        unsigned long flags;
 
        xa_lock_irqsave(&mapping->i_pages, flags);
-       radix_tree_tag_clear(&mapping->i_pages, page_index(page),
+       __xa_clear_mark(&mapping->i_pages, page_index(page),
                                                PAGECACHE_TAG_DIRTY);
        xa_unlock_irqrestore(&mapping->i_pages, flags);
 }

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index ecc3a4e2be96d8a25fd6814a9d09476b30095eaa..01006085904aad689ae3e24dbfb264346b1b560b 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -729,7 +729,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
 
        if (bit_pos == NR_DENTRY_IN_BLOCK &&
                !f2fs_truncate_hole(dir, page->index, page->index + 1)) {
-               f2fs_clear_radix_tree_dirty_tag(page);
+               f2fs_clear_page_cache_dirty_tag(page);
                clear_page_dirty_for_io(page);
                ClearPagePrivate(page);
                ClearPageUptodate(page);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index abf925664d9c5b9bf50f155824d34c9c86ce750f..3ccb8ed84faef1fc8a49808c186a8c9deaeaf171 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3039,7 +3039,7 @@ int f2fs_migrate_page(struct address_space *mapping, struct page *newpage,
                        struct page *page, enum migrate_mode mode);
 #endif
 bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len);
-void f2fs_clear_radix_tree_dirty_tag(struct page *page);
+void f2fs_clear_page_cache_dirty_tag(struct page *page);
 
 /*
  * gc.c

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 115dc219344b15be987905121b38961b8fdcd630..3e0a630a0168d31246402118732e4001b729e29b 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -245,7 +245,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)
        kunmap_atomic(src_addr);
        set_page_dirty(dn.inode_page);
 
-       f2fs_clear_radix_tree_dirty_tag(page);
+       f2fs_clear_page_cache_dirty_tag(page);
 
        set_inode_flag(inode, FI_APPEND_WRITE);
        set_inode_flag(inode, FI_DATA_EXIST);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index dd2e45a661aacdb123b63c92f84e717f17fa59c1..0bae5eda056ab1daba4cd3455552ba1dbf3afd2c 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -104,7 +104,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)
 static void clear_node_page_dirty(struct page *page)
 {
        if (PageDirty(page)) {
-               f2fs_clear_radix_tree_dirty_tag(page);
+               f2fs_clear_page_cache_dirty_tag(page);
                clear_page_dirty_for_io(page);
                dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);
        }
@@ -1307,9 +1307,7 @@ void f2fs_ra_node_page(struct f2fs_sb_info *sbi, nid_t nid)
        if (f2fs_check_nid_range(sbi, nid))
                return;
 
-       rcu_read_lock();
-       apage = radix_tree_lookup(&NODE_MAPPING(sbi)->i_pages, nid);
-       rcu_read_unlock();
+       apage = xa_load(&NODE_MAPPING(sbi)->i_pages, nid);
        if (apage)
                return;