btrfs: change return type of btrfs_lookup_bio_sums() 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_submit_chunk().

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index a3ee9a976f6fa5d0af475e2de04f9c2efbdcfd78..5c40035e493d924cd02cbac401105ef5d37588a4 100644 (file)
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -714,7 +714,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
         */
        if (bio_op(bio) == REQ_OP_READ && is_data_bbio(bbio)) {
                bbio->saved_iter = bio->bi_iter;
-               ret = btrfs_lookup_bio_sums(bbio);
+               error = btrfs_lookup_bio_sums(bbio);
+               ret = errno_to_blk_status(error);
                if (ret)
                        goto fail;
        }

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 827d156a7bd7a81d8a8137993d80955122b651ed..895c435314f5806af629d4b15f93c453821848df 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -336,7 +336,7 @@ out:
  *
  * Return: BLK_STS_RESOURCE if allocating memory fails, BLK_STS_OK otherwise.
  */
-blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
+int btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
 {
        struct btrfs_inode *inode = bbio->inode;
        struct btrfs_fs_info *fs_info = inode->root->fs_info;
@@ -347,12 +347,12 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
        u32 orig_len = bio->bi_iter.bi_size;
        u64 orig_disk_bytenr = bio->bi_iter.bi_sector << SECTOR_SHIFT;
        const unsigned int nblocks = orig_len >> fs_info->sectorsize_bits;
-       blk_status_t ret = BLK_STS_OK;
+       int ret = 0;
        u32 bio_offset = 0;
 
        if ((inode->flags & BTRFS_INODE_NODATASUM) ||
            test_bit(BTRFS_FS_STATE_NO_DATA_CSUMS, &fs_info->fs_state))
-               return BLK_STS_OK;
+               return 0;
 
        /*
         * This function is only called for read bio.
@@ -369,12 +369,12 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
        ASSERT(bio_op(bio) == REQ_OP_READ);
        path = btrfs_alloc_path();
        if (!path)
-               return BLK_STS_RESOURCE;
+               return -ENOMEM;
 
        if (nblocks * csum_size > BTRFS_BIO_INLINE_CSUM_SIZE) {
                bbio->csum = kmalloc_array(nblocks, csum_size, GFP_NOFS);
                if (!bbio->csum)
-                       return BLK_STS_RESOURCE;
+                       return -ENOMEM;
        } else {
                bbio->csum = bbio->csum_inline;
        }
@@ -406,7 +406,7 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
                count = search_csum_tree(fs_info, path, cur_disk_bytenr,
                                         orig_len - bio_offset, csum_dst);
                if (count < 0) {
-                       ret = errno_to_blk_status(count);
+                       ret = count;
                        if (bbio->csum != bbio->csum_inline)
                                kfree(bbio->csum);
                        bbio->csum = NULL;

diff --git a/fs/btrfs/file-item.h b/fs/btrfs/file-item.h
index 6181a70ec3efb4908594ea19575ab64300afef18..995539a68df8be40b9966d5078702c77b6895bd2 100644 (file)
--- a/fs/btrfs/file-item.h
+++ b/fs/btrfs/file-item.h
@@ -53,7 +53,7 @@ static inline u32 btrfs_file_extent_calc_inline_size(u32 datasize)
 
 int btrfs_del_csums(struct btrfs_trans_handle *trans,
                    struct btrfs_root *root, u64 bytenr, u64 len);
-blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio);
+int btrfs_lookup_bio_sums(struct btrfs_bio *bbio);
 int btrfs_insert_hole_extent(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root, u64 objectid, u64 pos,
                             u64 num_bytes);