MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2026-01-27 12:47:24 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

btrfs: change return type of btrfs_alloc_dummy_sum() to int

Browse Source 
The type blk_status_t is from block layer and not related to checksums
in our context. Use int internally and do the conversions to blk_status_t
as needed in btrfs_submit_chunk().

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2025-04-23 17:57:23 +02:00
parent d2080c7a00
commit 853b5727c9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/bio.c
View File

@ -755,7 +755,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
} else if (use_append || } else if (use_append ||
(btrfs_is_zoned(fs_info) && inode && (btrfs_is_zoned(fs_info) && inode &&
inode->flags & BTRFS_INODE_NODATASUM)) { inode->flags & BTRFS_INODE_NODATASUM)) {
status = btrfs_alloc_dummy_sum(bbio); ret = btrfs_alloc_dummy_sum(bbio);
status = errno_to_blk_status(ret);
if (status) if (status)
goto fail; goto fail;
} }

4
fs/btrfs/file-item.c
View File

@ -794,11 +794,11 @@ int btrfs_csum_one_bio(struct btrfs_bio *bbio)
* record the updated logical address on Zone Append completion. * record the updated logical address on Zone Append completion.
* Allocate just the structure with an empty sums array here for that case. * Allocate just the structure with an empty sums array here for that case.
*/ */
blk_status_t btrfs_alloc_dummy_sum(struct btrfs_bio *bbio) int btrfs_alloc_dummy_sum(struct btrfs_bio *bbio)
{ {
bbio->sums = kmalloc(sizeof(*bbio->sums), GFP_NOFS); bbio->sums = kmalloc(sizeof(*bbio->sums), GFP_NOFS);
if (!bbio->sums) if (!bbio->sums)
return BLK_STS_RESOURCE; return -ENOMEM;
bbio->sums->len = bbio->bio.bi_iter.bi_size; bbio->sums->len = bbio->bio.bi_iter.bi_size;
bbio->sums->logical = bbio->bio.bi_iter.bi_sector << SECTOR_SHIFT; bbio->sums->logical = bbio->bio.bi_iter.bi_sector << SECTOR_SHIFT;
btrfs_add_ordered_sum(bbio->ordered, bbio->sums); btrfs_add_ordered_sum(bbio->ordered, bbio->sums);

2
fs/btrfs/file-item.h
View File

@ -65,7 +65,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_ordered_sum *sums); struct btrfs_ordered_sum *sums);
int btrfs_csum_one_bio(struct btrfs_bio *bbio); int btrfs_csum_one_bio(struct btrfs_bio *bbio);
blk_status_t btrfs_alloc_dummy_sum(struct btrfs_bio *bbio); int btrfs_alloc_dummy_sum(struct btrfs_bio *bbio);
int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
struct list_head *list, int search_commit, struct list_head *list, int search_commit,
bool nowait); bool nowait);