Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: rename ret to status in btrfs_submit_chunk() 

We're using 'status' for the blk_status_t variables, rename 'ret' so we
can use it for proper return type.

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:18 +02:00
parent 64c13195dd
commit beaa7cdb6a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/btrfs/bio.c
View File

@ -674,7 +674,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
bool use_append = btrfs_use_zone_append(bbio); bool use_append = btrfs_use_zone_append(bbio);
struct btrfs_io_context *bioc = NULL; struct btrfs_io_context *bioc = NULL;
struct btrfs_io_stripe smap; struct btrfs_io_stripe smap;
blk_status_t ret; blk_status_t status;
int error; int error;
if (!bbio->inode || btrfs_is_data_reloc_root(inode->root)) if (!bbio->inode || btrfs_is_data_reloc_root(inode->root))
@ -686,7 +686,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
error = btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length, error = btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,
&bioc, &smap, &mirror_num); &bioc, &smap, &mirror_num);
if (error) { if (error) {
ret = errno_to_blk_status(error); status = errno_to_blk_status(error);
btrfs_bio_counter_dec(fs_info); btrfs_bio_counter_dec(fs_info);
goto end_bbio; goto end_bbio;
} }
@ -700,7 +700,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
split = btrfs_split_bio(fs_info, bbio, map_length); split = btrfs_split_bio(fs_info, bbio, map_length);
if (IS_ERR(split)) { if (IS_ERR(split)) {
ret = errno_to_blk_status(PTR_ERR(split)); status = errno_to_blk_status(PTR_ERR(split));
btrfs_bio_counter_dec(fs_info); btrfs_bio_counter_dec(fs_info);
goto end_bbio; goto end_bbio;
} }
@ -715,8 +715,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
if (bio_op(bio) == REQ_OP_READ && is_data_bbio(bbio)) { if (bio_op(bio) == REQ_OP_READ && is_data_bbio(bbio)) {
bbio->saved_iter = bio->bi_iter; bbio->saved_iter = bio->bi_iter;
error = btrfs_lookup_bio_sums(bbio); error = btrfs_lookup_bio_sums(bbio);
ret = errno_to_blk_status(error); status = errno_to_blk_status(error);
if (ret) if (status)
goto fail; goto fail;
} }
@ -749,14 +749,14 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
goto done; goto done;
error = btrfs_bio_csum(bbio); error = btrfs_bio_csum(bbio);
ret = errno_to_blk_status(error); status = errno_to_blk_status(error);
if (ret) if (status)
goto fail; goto fail;
} 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)) {
ret = btrfs_alloc_dummy_sum(bbio); status = btrfs_alloc_dummy_sum(bbio);
if (ret) if (status)
goto fail; goto fail;
} }
} }
@ -777,10 +777,10 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
ASSERT(bbio->bio.bi_pool == &btrfs_clone_bioset); ASSERT(bbio->bio.bi_pool == &btrfs_clone_bioset);
ASSERT(remaining); ASSERT(remaining);
btrfs_bio_end_io(remaining, ret); btrfs_bio_end_io(remaining, status);
} }
end_bbio: end_bbio:
btrfs_bio_end_io(bbio, ret); btrfs_bio_end_io(bbio, status);
/* Do not submit another chunk */ /* Do not submit another chunk */
return true; return true;
} }