btrfs: do not return errors from submit_bio_hook_t instances

Both btrfs_repair_one_sector and submit_bio_one as the direct caller of
one of the instances ignore errors as they expect the methods themselves
to call ->bi_end_io on error.  Remove the unused and dangerous return
value.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 5b7e948ea6516452f87b52eabfa384d753af016c..dd23f78664f19b82d32d7a91fa825fb7aeb1e406 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3250,8 +3250,8 @@ void btrfs_inode_safe_disk_i_size_write(struct btrfs_inode *inode, u64 new_i_siz
 u64 btrfs_file_extent_end(const struct btrfs_path *path);
 
 /* inode.c */
-blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio,
-                                  int mirror_num, unsigned long bio_flags);
+void btrfs_submit_data_bio(struct inode *inode, struct bio *bio,
+                          int mirror_num, unsigned long bio_flags);
 unsigned int btrfs_verify_data_csum(struct btrfs_bio *bbio,
                                    u32 bio_offset, struct page *page,
                                    u64 start, u64 end);

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index c94df8e2ab9d6b29b052836873a0d0c3ccbdc0ce..b390ec79f9a8611bba620bd7d86656a72f649988 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -71,7 +71,7 @@ struct btrfs_fs_info;
 struct io_failure_record;
 struct extent_io_tree;
 
-typedef blk_status_t (submit_bio_hook_t)(struct inode *inode, struct bio *bio,
+typedef void (submit_bio_hook_t)(struct inode *inode, struct bio *bio,
                                         int mirror_num,
                                         unsigned long bio_flags);
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index e3e4f8b41923a0536cb9b72249040608259151a4..72b3bff2742ef5904dc5c74b4654431a3219c505 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2570,9 +2570,8 @@ out:
  *
  *    c-3) otherwise:                  async submit
  */
-blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio,
-                                  int mirror_num, unsigned long bio_flags)
-
+void btrfs_submit_data_bio(struct inode *inode, struct bio *bio,
+                          int mirror_num, unsigned long bio_flags)
 {
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_root *root = BTRFS_I(inode)->root;
@@ -2609,7 +2608,7 @@ blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio,
                         */
                        btrfs_submit_compressed_read(inode, bio, mirror_num,
                                                     bio_flags);
-                       return BLK_STS_OK;
+                       return;
                } else {
                        /*
                         * Lookup bio sums does extra checks around whether we
@@ -2643,7 +2642,6 @@ out:
                bio->bi_status = ret;
                bio_endio(bio);
        }
-       return ret;
 }
 
 /*
@@ -7787,25 +7785,20 @@ static void btrfs_dio_private_put(struct btrfs_dio_private *dip)
        kfree(dip);
 }
 
-static blk_status_t submit_dio_repair_bio(struct inode *inode, struct bio *bio,
-                                         int mirror_num,
-                                         unsigned long bio_flags)
+static void submit_dio_repair_bio(struct inode *inode, struct bio *bio,
+                                 int mirror_num, unsigned long bio_flags)
 {
        struct btrfs_dio_private *dip = bio->bi_private;
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
-       blk_status_t ret;
 
        BUG_ON(bio_op(bio) == REQ_OP_WRITE);
 
-       ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA);
-       if (ret)
-               return ret;
+       if (btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA))
+               return;
 
        refcount_inc(&dip->refs);
-       ret = btrfs_map_bio(fs_info, bio, mirror_num);
-       if (ret)
+       if (btrfs_map_bio(fs_info, bio, mirror_num))
                refcount_dec(&dip->refs);
-       return ret;
 }
 
 static blk_status_t btrfs_check_read_dio_bio(struct btrfs_dio_private *dip,