Merge branch 'xarray' of git://git.infradead.org/users/willy/linux-dax

[platform/kernel/linux-starfive.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 106f116..b293cb3 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2071,7 +2071,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
        pgoff_t done_index;
        int cycled;
        int range_whole = 0;
-       int tag;
+       xa_mark_t tag;
        int nwritten = 0;
 
        pagevec_init(&pvec);
@@ -2787,13 +2787,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);
 }