diff options
| author | David Sterba <dsterba@suse.com> | 2025-04-23 17:57:15 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2025-05-15 14:30:48 +0200 |
| commit | 9b20d242af41197956c9d3cb6b5bbe7706da5d4d (patch) | |
| tree | 2cd096c52d96ff31b38667b38636d02d5f7805d3 | |
| parent | 6f6e7e98b081d47d997ae8753539a51bee29856d (diff) | |
btrfs: change return type of btrfs_csum_one_bio() to int
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_bio_csum().
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/bio.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/file-item.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/file-item.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c index 5c40035e493d..4f622bf130c2 100644 --- a/fs/btrfs/bio.c +++ b/fs/btrfs/bio.c @@ -516,7 +516,7 @@ static blk_status_t btrfs_bio_csum(struct btrfs_bio *bbio) { if (bbio->bio.bi_opf & REQ_META) return btree_csum_one_bio(bbio); - return btrfs_csum_one_bio(bbio); + return errno_to_blk_status(btrfs_csum_one_bio(bbio)); } /* diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index 895c435314f5..293dd3298b98 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -735,7 +735,7 @@ fail: /* * Calculate checksums of the data contained inside a bio. */ -blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio) +int btrfs_csum_one_bio(struct btrfs_bio *bbio) { struct btrfs_ordered_extent *ordered = bbio->ordered; struct btrfs_inode *inode = bbio->inode; @@ -757,7 +757,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio) memalloc_nofs_restore(nofs_flag); if (!sums) - return BLK_STS_RESOURCE; + return -ENOMEM; sums->len = bio->bi_iter.bi_size; INIT_LIST_HEAD(&sums->list); diff --git a/fs/btrfs/file-item.h b/fs/btrfs/file-item.h index 995539a68df8..323dfb84f16c 100644 --- a/fs/btrfs/file-item.h +++ b/fs/btrfs/file-item.h @@ -64,7 +64,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans, int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_ordered_sum *sums); -blk_status_t 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_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end, struct list_head *list, int search_commit, |