]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
f2fs: Use a folio in f2fs_all_cluster_page_ready()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 28 Nov 2024 04:58:16 +0000 (04:58 +0000)
committerJaegeuk Kim <jaegeuk@kernel.org>
Mon, 16 Dec 2024 16:11:51 +0000 (16:11 +0000)
Remove references to page->index and use folio_test_uptodate()
instead of PageUptodate().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/compress.c

index 7f26440e8595a160a0233588f627a15256fe7efe..9f8d0f4c8564c1bfc7a42880b05773cf8eed8ec2 100644 (file)
@@ -846,7 +846,7 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index)
 bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct page **pages,
                                int index, int nr_pages, bool uptodate)
 {
-       unsigned long pgidx = pages[index]->index;
+       unsigned long pgidx = page_folio(pages[index])->index;
        int i = uptodate ? 0 : 1;
 
        /*
@@ -860,9 +860,11 @@ bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct page **pages,
                return false;
 
        for (; i < cc->cluster_size; i++) {
-               if (pages[index + i]->index != pgidx + i)
+               struct folio *folio = page_folio(pages[index + i]);
+
+               if (folio->index != pgidx + i)
                        return false;
-               if (uptodate && !PageUptodate(pages[index + i]))
+               if (uptodate && !folio_test_uptodate(folio))
                        return false;
        }