btrfs: convert zstd_decompress() to take a folio

The old page API is being gradually replaced and converted to use folio
to improve code readability and avoid repeated conversion between page
and folio. And memcpy_to_page() can be replaced with memcpy_to_folio().
But there is no memzero_folio(), but it can be replaced equivalently by
folio_zero_range().

Signed-off-by: Li Zetao <lizetao1@huawei.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index a70ca9c94ea791693a555c7b14d81ec491468275..a5f7cbe1c06ed26fee839509d69540e8082aa121 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -146,7 +146,7 @@ static int compression_decompress(int type, struct list_head *ws,
                                                dest_pgoff, srclen, destlen);
        case BTRFS_COMPRESS_LZO:  return lzo_decompress(ws, data_in, page_folio(dest_page),
                                                dest_pgoff, srclen, destlen);
-       case BTRFS_COMPRESS_ZSTD: return zstd_decompress(ws, data_in, dest_page,
+       case BTRFS_COMPRESS_ZSTD: return zstd_decompress(ws, data_in, page_folio(dest_page),
                                                dest_pgoff, srclen, destlen);
        case BTRFS_COMPRESS_NONE:
        default:

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 4b5a7ba54815cc816da54ce37f4c33a07e8e900e..d2453cf28eef8ec43dd75f31533b9290e9036211 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -183,7 +183,7 @@ int zstd_compress_folios(struct list_head *ws, struct address_space *mapping,
                unsigned long *total_in, unsigned long *total_out);
 int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb);
 int zstd_decompress(struct list_head *ws, const u8 *data_in,
-               struct page *dest_page, unsigned long dest_pgoff, size_t srclen,
+               struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,
                size_t destlen);
 void zstd_init_workspace_manager(void);
 void zstd_cleanup_workspace_manager(void);

diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index 05cf7cebc17c85180c6c210c8d055834eae6da05..866607fd3e588450f9e8cb4e55303a6d130bd567 100644 (file)
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -656,11 +656,11 @@ done:
 }
 
 int zstd_decompress(struct list_head *ws, const u8 *data_in,
-               struct page *dest_page, unsigned long dest_pgoff, size_t srclen,
+               struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen,
                size_t destlen)
 {
        struct workspace *workspace = list_entry(ws, struct workspace, list);
-       struct btrfs_fs_info *fs_info = btrfs_sb(dest_page->mapping->host->i_sb);
+       struct btrfs_fs_info *fs_info = btrfs_sb(folio_inode(dest_folio)->i_sb);
        const u32 sectorsize = fs_info->sectorsize;
        zstd_dstream *stream;
        int ret = 0;
@@ -669,12 +669,12 @@ int zstd_decompress(struct list_head *ws, const u8 *data_in,
        stream = zstd_init_dstream(
                        ZSTD_BTRFS_MAX_INPUT, workspace->mem, workspace->size);
        if (unlikely(!stream)) {
-               struct btrfs_inode *inode = BTRFS_I(dest_page->mapping->host);
+               struct btrfs_inode *inode = folio_to_inode(dest_folio);
 
                btrfs_err(inode->root->fs_info,
                "zstd decompression init failed, root %llu inode %llu offset %llu",
                          btrfs_root_id(inode->root), btrfs_ino(inode),
-                         page_offset(dest_page));
+                         folio_pos(dest_folio));
                ret = -EIO;
                goto finish;
        }
@@ -693,21 +693,21 @@ int zstd_decompress(struct list_head *ws, const u8 *data_in,
         */
        ret = zstd_decompress_stream(stream, &workspace->out_buf, &workspace->in_buf);
        if (unlikely(zstd_is_error(ret))) {
-               struct btrfs_inode *inode = BTRFS_I(dest_page->mapping->host);
+               struct btrfs_inode *inode = folio_to_inode(dest_folio);
 
                btrfs_err(inode->root->fs_info,
                "zstd decompression failed, error %d root %llu inode %llu offset %llu",
                          zstd_get_error_code(ret), btrfs_root_id(inode->root),
-                         btrfs_ino(inode), page_offset(dest_page));
+                         btrfs_ino(inode), folio_pos(dest_folio));
                goto finish;
        }
        to_copy = workspace->out_buf.pos;
-       memcpy_to_page(dest_page, dest_pgoff, workspace->out_buf.dst, to_copy);
+       memcpy_to_folio(dest_folio, dest_pgoff, workspace->out_buf.dst, to_copy);
 finish:
        /* Error or early end. */
        if (unlikely(to_copy < destlen)) {
                ret = -EIO;
-               memzero_page(dest_page, dest_pgoff + to_copy, destlen - to_copy);
+               folio_zero_range(dest_folio, dest_pgoff + to_copy, destlen - to_copy);
        }
        return ret;
 }