Skip to content

Commit b9cf75b

Browse files
Li Zetaokdave
authored andcommitted
btrfs: convert copy_inline_to_page() to use 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. Moreover find_or_create_page() is compatible API, and it can replaced with __filemap_get_folio(). Some interfaces have been converted to use folio before, so the conversion operation from page can be eliminated here. Signed-off-by: Li Zetao <lizetao1@huawei.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 903b027 commit b9cf75b

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

fs/btrfs/reflink.c

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
6666
const size_t inline_size = size - btrfs_file_extent_calc_inline_size(0);
6767
char *data_start = inline_data + btrfs_file_extent_calc_inline_size(0);
6868
struct extent_changeset *data_reserved = NULL;
69-
struct page *page = NULL;
69+
struct folio *folio = NULL;
7070
struct address_space *mapping = inode->vfs_inode.i_mapping;
7171
int ret;
7272

@@ -83,14 +83,15 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
8383
if (ret)
8484
goto out;
8585

86-
page = find_or_create_page(mapping, file_offset >> PAGE_SHIFT,
87-
btrfs_alloc_write_mask(mapping));
88-
if (!page) {
86+
folio = __filemap_get_folio(mapping, file_offset >> PAGE_SHIFT,
87+
FGP_LOCK | FGP_ACCESSED | FGP_CREAT,
88+
btrfs_alloc_write_mask(mapping));
89+
if (IS_ERR(folio)) {
8990
ret = -ENOMEM;
9091
goto out_unlock;
9192
}
9293

93-
ret = set_page_extent_mapped(page);
94+
ret = set_folio_extent_mapped(folio);
9495
if (ret < 0)
9596
goto out_unlock;
9697

@@ -115,15 +116,15 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
115116
set_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &inode->runtime_flags);
116117

117118
if (comp_type == BTRFS_COMPRESS_NONE) {
118-
memcpy_to_page(page, offset_in_page(file_offset), data_start,
119-
datal);
119+
memcpy_to_folio(folio, offset_in_folio(folio, file_offset), data_start,
120+
datal);
120121
} else {
121-
ret = btrfs_decompress(comp_type, data_start, page_folio(page),
122-
offset_in_page(file_offset),
122+
ret = btrfs_decompress(comp_type, data_start, folio,
123+
offset_in_folio(folio, file_offset),
123124
inline_size, datal);
124125
if (ret)
125126
goto out_unlock;
126-
flush_dcache_page(page);
127+
flush_dcache_folio(folio);
127128
}
128129

129130
/*
@@ -139,15 +140,15 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
139140
* So what's in the range [500, 4095] corresponds to zeroes.
140141
*/
141142
if (datal < block_size)
142-
memzero_page(page, datal, block_size - datal);
143+
folio_zero_range(folio, datal, block_size - datal);
143144

144-
btrfs_folio_set_uptodate(fs_info, page_folio(page), file_offset, block_size);
145-
btrfs_folio_clear_checked(fs_info, page_folio(page), file_offset, block_size);
146-
btrfs_folio_set_dirty(fs_info, page_folio(page), file_offset, block_size);
145+
btrfs_folio_set_uptodate(fs_info, folio, file_offset, block_size);
146+
btrfs_folio_clear_checked(fs_info, folio, file_offset, block_size);
147+
btrfs_folio_set_dirty(fs_info, folio, file_offset, block_size);
147148
out_unlock:
148-
if (page) {
149-
unlock_page(page);
150-
put_page(page);
149+
if (!IS_ERR(folio)) {
150+
folio_unlock(folio);
151+
folio_put(folio);
151152
}
152153
if (ret)
153154
btrfs_delalloc_release_space(inode, data_reserved, file_offset,

0 commit comments

Comments
 (0)