f2fs: Pass a folio to f2fs_is_compressed_page()

All callers now have a folio so pass it in.  Also remove the test for
the private flag; it is redundant with checking folio->private for being
NULL.

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

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 5847d22a58336f4eb221c57ca6945c599cdfef7e..24c7489b7427257abcd7765713c132dd6a5ddcc0 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -71,17 +71,15 @@ static pgoff_t start_idx_of_cluster(struct compress_ctx *cc)
        return cc->cluster_idx << cc->log_cluster_size;
 }
 
-bool f2fs_is_compressed_page(struct page *page)
+bool f2fs_is_compressed_page(struct folio *folio)
 {
-       if (!PagePrivate(page))
+       if (!folio->private)
                return false;
-       if (!page_private(page))
-               return false;
-       if (page_private_nonpointer(page))
+       if (folio_test_f2fs_nonpointer(folio))
                return false;
 
-       f2fs_bug_on(F2FS_P_SB(page),
-               *((u32 *)page_private(page)) != F2FS_COMPRESSED_PAGE_MAGIC);
+       f2fs_bug_on(F2FS_F_SB(folio),
+               *((u32 *)folio->private) != F2FS_COMPRESSED_PAGE_MAGIC);
        return true;
 }
 
@@ -1478,7 +1476,7 @@ void f2fs_compress_write_end_io(struct bio *bio, struct folio *folio)
        struct f2fs_sb_info *sbi = bio->bi_private;
        struct compress_io_ctx *cic = folio->private;
        enum count_type type = WB_DATA_TYPE(folio,
-                               f2fs_is_compressed_page(page));
+                               f2fs_is_compressed_page(folio));
        int i;
 
        if (unlikely(bio->bi_status != BLK_STS_OK))

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5d3e8a4e754ed3fa2e7985aab000506db5424273..1bb4b0c87e36cf2699c83b5a236d4e3eecf5fa2e 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -142,7 +142,7 @@ static void f2fs_finish_read_bio(struct bio *bio, bool in_task)
        bio_for_each_folio_all(fi, bio) {
                struct folio *folio = fi.folio;
 
-               if (f2fs_is_compressed_page(&folio->page)) {
+               if (f2fs_is_compressed_page(folio)) {
                        if (ctx && !ctx->decompression_attempted)
                                f2fs_end_read_compressed_page(folio, true, 0,
                                                        in_task);
@@ -186,7 +186,7 @@ static void f2fs_verify_bio(struct work_struct *work)
                bio_for_each_folio_all(fi, bio) {
                        struct folio *folio = fi.folio;
 
-                       if (!f2fs_is_compressed_page(&folio->page) &&
+                       if (!f2fs_is_compressed_page(folio) &&
                            !fsverity_verify_page(&folio->page)) {
                                bio->bi_status = BLK_STS_IOERR;
                                break;
@@ -239,7 +239,7 @@ static void f2fs_handle_step_decompress(struct bio_post_read_ctx *ctx,
        bio_for_each_folio_all(fi, ctx->bio) {
                struct folio *folio = fi.folio;
 
-               if (f2fs_is_compressed_page(&folio->page))
+               if (f2fs_is_compressed_page(folio))
                        f2fs_end_read_compressed_page(folio, false, blkaddr,
                                                      in_task);
                else
@@ -337,7 +337,7 @@ static void f2fs_write_end_io(struct bio *bio)
                }
 
 #ifdef CONFIG_F2FS_FS_COMPRESSION
-               if (f2fs_is_compressed_page(&folio->page)) {
+               if (f2fs_is_compressed_page(folio)) {
                        f2fs_compress_write_end_io(bio, folio);
                        continue;
                }
@@ -561,7 +561,7 @@ static bool __has_merged_page(struct bio *bio, struct inode *inode,
                        if (IS_ERR(target))
                                continue;
                }
-               if (f2fs_is_compressed_page(&target->page)) {
+               if (f2fs_is_compressed_page(target)) {
                        target = f2fs_compress_control_folio(target);
                        if (IS_ERR(target))
                                continue;

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 2c3b6ea5c1d20105749bebe1807a17541fb1a5f0..73f80b2514d15b66481ae8adf0a1f665ab56e9af 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4474,7 +4474,7 @@ enum cluster_check_type {
        CLUSTER_COMPR_BLKS, /* return # of compressed blocks in a cluster */
        CLUSTER_RAW_BLKS    /* return # of raw blocks in a cluster */
 };
-bool f2fs_is_compressed_page(struct page *page);
+bool f2fs_is_compressed_page(struct folio *folio);
 struct folio *f2fs_compress_control_folio(struct folio *folio);
 int f2fs_prepare_compress_overwrite(struct inode *inode,
                        struct page **pagep, pgoff_t index, void **fsdata);
@@ -4543,7 +4543,7 @@ void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino);
                sbi->compr_saved_block += diff;                         \
        } while (0)
 #else
-static inline bool f2fs_is_compressed_page(struct page *page) { return false; }
+static inline bool f2fs_is_compressed_page(struct folio *folio) { return false; }
 static inline bool f2fs_is_compress_backend_ready(struct inode *inode)
 {
        if (!f2fs_compressed_file(inode))