btrfs: convert lzo_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 e97692fdfab0068fa9fa068cc0f12e0a4d097188..a70ca9c94ea791693a555c7b14d81ec491468275 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -144,7 +144,7 @@ static int compression_decompress(int type, struct list_head *ws,
        switch (type) {
        case BTRFS_COMPRESS_ZLIB: return zlib_decompress(ws, data_in, page_folio(dest_page),
                                                dest_pgoff, srclen, destlen);
-       case BTRFS_COMPRESS_LZO:  return lzo_decompress(ws, data_in, dest_page,
+       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,
                                                dest_pgoff, srclen, destlen);

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index f4f7a981cb90cc79762ca65d77d8b176cb43964e..4b5a7ba54815cc816da54ce37f4c33a07e8e900e 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -173,7 +173,7 @@ int lzo_compress_folios(struct list_head *ws, struct address_space *mapping,
                unsigned long *total_in, unsigned long *total_out);
 int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb);
 int lzo_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 list_head *lzo_alloc_workspace(unsigned int level);
 void lzo_free_workspace(struct list_head *ws);

diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
index 1e2a68b8f62d8a97f1f882a7ad88e3f4bb19ba7f..72856f6775f7f17e8a5633ae436b2dcfe12b434a 100644 (file)
--- a/fs/btrfs/lzo.c
+++ b/fs/btrfs/lzo.c
@@ -438,11 +438,11 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb)
 }
 
 int lzo_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 = page_to_fs_info(dest_page);
+       struct btrfs_fs_info *fs_info = folio_to_fs_info(dest_folio);
        const u32 sectorsize = fs_info->sectorsize;
        size_t in_len;
        size_t out_len;
@@ -467,22 +467,22 @@ int lzo_decompress(struct list_head *ws, const u8 *data_in,
        out_len = sectorsize;
        ret = lzo1x_decompress_safe(data_in, in_len, workspace->buf, &out_len);
        if (unlikely(ret != LZO_E_OK)) {
-               struct btrfs_inode *inode = BTRFS_I(dest_page->mapping->host);
+               struct btrfs_inode *inode = folio_to_inode(dest_folio);
 
                btrfs_err(fs_info,
                "lzo decompression failed, error %d root %llu inode %llu offset %llu",
                          ret, btrfs_root_id(inode->root), btrfs_ino(inode),
-                         page_offset(dest_page));
+                         folio_pos(dest_folio));
                ret = -EIO;
                goto out;
        }
 
        ASSERT(out_len <= sectorsize);
-       memcpy_to_page(dest_page, dest_pgoff, workspace->buf, out_len);
+       memcpy_to_folio(dest_folio, dest_pgoff, workspace->buf, out_len);
        /* Early end, considered as an error. */
        if (unlikely(out_len < destlen)) {
                ret = -EIO;
-               memzero_page(dest_page, dest_pgoff + out_len, destlen - out_len);
+               folio_zero_range(dest_folio, dest_pgoff + out_len, destlen - out_len);
        }
 out:
        return ret;