Skip to content

Commit 9c0b080

Browse files
committed
btrfs: rename error to ret in btrfs_submit_chunk()
We can now rename 'error' to 'ret' and use it for generic errors. Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent beaa7cd commit 9c0b080

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

fs/btrfs/bio.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -675,18 +675,18 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
675675
struct btrfs_io_context *bioc = NULL;
676676
struct btrfs_io_stripe smap;
677677
blk_status_t status;
678-
int error;
678+
int ret;
679679

680680
if (!bbio->inode || btrfs_is_data_reloc_root(inode->root))
681681
smap.rst_search_commit_root = true;
682682
else
683683
smap.rst_search_commit_root = false;
684684

685685
btrfs_bio_counter_inc_blocked(fs_info);
686-
error = btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,
687-
&bioc, &smap, &mirror_num);
688-
if (error) {
689-
status = errno_to_blk_status(error);
686+
ret = btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,
687+
&bioc, &smap, &mirror_num);
688+
if (ret) {
689+
status = errno_to_blk_status(ret);
690690
btrfs_bio_counter_dec(fs_info);
691691
goto end_bbio;
692692
}
@@ -714,8 +714,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
714714
*/
715715
if (bio_op(bio) == REQ_OP_READ && is_data_bbio(bbio)) {
716716
bbio->saved_iter = bio->bi_iter;
717-
error = btrfs_lookup_bio_sums(bbio);
718-
status = errno_to_blk_status(error);
717+
ret = btrfs_lookup_bio_sums(bbio);
718+
status = errno_to_blk_status(ret);
719719
if (status)
720720
goto fail;
721721
}
@@ -748,8 +748,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
748748
btrfs_wq_submit_bio(bbio, bioc, &smap, mirror_num))
749749
goto done;
750750

751-
error = btrfs_bio_csum(bbio);
752-
status = errno_to_blk_status(error);
751+
ret = btrfs_bio_csum(bbio);
752+
status = errno_to_blk_status(ret);
753753
if (status)
754754
goto fail;
755755
} else if (use_append ||

0 commit comments

Comments
 (0)