Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Li Zetao and committed by
David Sterba
b70f3a45 9f9a4e43

+10 -10
+1 -1
fs/btrfs/compression.c
··· 146 146 dest_pgoff, srclen, destlen); 147 147 case BTRFS_COMPRESS_LZO: return lzo_decompress(ws, data_in, page_folio(dest_page), 148 148 dest_pgoff, srclen, destlen); 149 - case BTRFS_COMPRESS_ZSTD: return zstd_decompress(ws, data_in, dest_page, 149 + case BTRFS_COMPRESS_ZSTD: return zstd_decompress(ws, data_in, page_folio(dest_page), 150 150 dest_pgoff, srclen, destlen); 151 151 case BTRFS_COMPRESS_NONE: 152 152 default:
+1 -1
fs/btrfs/compression.h
··· 183 183 unsigned long *total_in, unsigned long *total_out); 184 184 int zstd_decompress_bio(struct list_head *ws, struct compressed_bio *cb); 185 185 int zstd_decompress(struct list_head *ws, const u8 *data_in, 186 - struct page *dest_page, unsigned long dest_pgoff, size_t srclen, 186 + struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen, 187 187 size_t destlen); 188 188 void zstd_init_workspace_manager(void); 189 189 void zstd_cleanup_workspace_manager(void);
+8 -8
fs/btrfs/zstd.c
··· 656 656 } 657 657 658 658 int zstd_decompress(struct list_head *ws, const u8 *data_in, 659 - struct page *dest_page, unsigned long dest_pgoff, size_t srclen, 659 + struct folio *dest_folio, unsigned long dest_pgoff, size_t srclen, 660 660 size_t destlen) 661 661 { 662 662 struct workspace *workspace = list_entry(ws, struct workspace, list); 663 - struct btrfs_fs_info *fs_info = btrfs_sb(dest_page->mapping->host->i_sb); 663 + struct btrfs_fs_info *fs_info = btrfs_sb(folio_inode(dest_folio)->i_sb); 664 664 const u32 sectorsize = fs_info->sectorsize; 665 665 zstd_dstream *stream; 666 666 int ret = 0; ··· 669 669 stream = zstd_init_dstream( 670 670 ZSTD_BTRFS_MAX_INPUT, workspace->mem, workspace->size); 671 671 if (unlikely(!stream)) { 672 - struct btrfs_inode *inode = BTRFS_I(dest_page->mapping->host); 672 + struct btrfs_inode *inode = folio_to_inode(dest_folio); 673 673 674 674 btrfs_err(inode->root->fs_info, 675 675 "zstd decompression init failed, root %llu inode %llu offset %llu", 676 676 btrfs_root_id(inode->root), btrfs_ino(inode), 677 - page_offset(dest_page)); 677 + folio_pos(dest_folio)); 678 678 ret = -EIO; 679 679 goto finish; 680 680 } ··· 693 693 */ 694 694 ret = zstd_decompress_stream(stream, &workspace->out_buf, &workspace->in_buf); 695 695 if (unlikely(zstd_is_error(ret))) { 696 - struct btrfs_inode *inode = BTRFS_I(dest_page->mapping->host); 696 + struct btrfs_inode *inode = folio_to_inode(dest_folio); 697 697 698 698 btrfs_err(inode->root->fs_info, 699 699 "zstd decompression failed, error %d root %llu inode %llu offset %llu", 700 700 zstd_get_error_code(ret), btrfs_root_id(inode->root), 701 - btrfs_ino(inode), page_offset(dest_page)); 701 + btrfs_ino(inode), folio_pos(dest_folio)); 702 702 goto finish; 703 703 } 704 704 to_copy = workspace->out_buf.pos; 705 - memcpy_to_page(dest_page, dest_pgoff, workspace->out_buf.dst, to_copy); 705 + memcpy_to_folio(dest_folio, dest_pgoff, workspace->out_buf.dst, to_copy); 706 706 finish: 707 707 /* Error or early end. */ 708 708 if (unlikely(to_copy < destlen)) { 709 709 ret = -EIO; 710 - memzero_page(dest_page, dest_pgoff + to_copy, destlen - to_copy); 710 + folio_zero_range(dest_folio, dest_pgoff + to_copy, destlen - to_copy); 711 711 } 712 712 return ret; 713 713 }