Merge tag 'folio-5.18d' of git://git.infradead.org/users/willy/pagecache

[linux-2.6-microblaze.git] / fs / ubifs / file.c

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 8a9ffc2..0383fbd 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -570,7 +570,7 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping,
        }
 
        if (!PagePrivate(page)) {
-               SetPagePrivate(page);
+               attach_page_private(page, (void *)1);
                atomic_long_inc(&c->dirty_pg_cnt);
                __set_page_dirty_nobuffers(page);
        }
@@ -947,7 +947,7 @@ static int do_writepage(struct page *page, int len)
                release_existing_page_budget(c);
 
        atomic_long_dec(&c->dirty_pg_cnt);
-       ClearPagePrivate(page);
+       detach_page_private(page);
        ClearPageChecked(page);
 
        kunmap(page);
@@ -1304,7 +1304,7 @@ static void ubifs_invalidate_folio(struct folio *folio, size_t offset,
                release_existing_page_budget(c);
 
        atomic_long_dec(&c->dirty_pg_cnt);
-       folio_clear_private(folio);
+       folio_detach_private(folio);
        folio_clear_checked(folio);
 }
 
@@ -1471,8 +1471,8 @@ static int ubifs_migrate_page(struct address_space *mapping,
                return rc;
 
        if (PagePrivate(page)) {
-               ClearPagePrivate(page);
-               SetPagePrivate(newpage);
+               detach_page_private(page);
+               attach_page_private(newpage, (void *)1);
        }
 
        if (mode != MIGRATE_SYNC_NO_COPY)
@@ -1496,7 +1496,7 @@ static int ubifs_releasepage(struct page *page, gfp_t unused_gfp_flags)
                return 0;
        ubifs_assert(c, PagePrivate(page));
        ubifs_assert(c, 0);
-       ClearPagePrivate(page);
+       detach_page_private(page);
        ClearPageChecked(page);
        return 1;
 }
@@ -1567,7 +1567,7 @@ static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fault *vmf)
        else {
                if (!PageChecked(page))
                        ubifs_convert_page_budget(c);
-               SetPagePrivate(page);
+               attach_page_private(page, (void *)1);
                atomic_long_inc(&c->dirty_pg_cnt);
                __set_page_dirty_nobuffers(page);
        }