btrfs: remove btrfs_end_io_wq

[people/ms/linux.git] / fs / btrfs / inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 316c73d7d8cabb0ae45f192d6ce1fa438062dacf..9cce0a3228f831ae065e57aee353da3841534db5 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2631,12 +2631,6 @@ void btrfs_submit_data_read_bio(struct inode *inode, struct bio *bio,
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        blk_status_t ret;
 
-       ret = btrfs_bio_wq_end_io(fs_info, bio,
-                       btrfs_is_free_space_inode(BTRFS_I(inode)) ?
-                       BTRFS_WQ_ENDIO_FREE_SPACE : BTRFS_WQ_ENDIO_DATA);
-       if (ret)
-               goto out;
-
        if (compress_type != BTRFS_COMPRESS_NONE) {
                /*
                 * btrfs_submit_compressed_read will handle completing the bio
@@ -7879,9 +7873,6 @@ static void submit_dio_repair_bio(struct inode *inode, struct bio *bio,
 
        BUG_ON(bio_op(bio) == REQ_OP_WRITE);
 
-       if (btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA))
-               return;
-
        refcount_inc(&dip->refs);
        if (btrfs_map_bio(fs_info, bio, mirror_num))
                refcount_dec(&dip->refs);
@@ -7970,19 +7961,12 @@ static inline blk_status_t btrfs_submit_dio_bio(struct bio *bio,
 {
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
        struct btrfs_dio_private *dip = bio->bi_private;
-       bool write = btrfs_op(bio) == BTRFS_MAP_WRITE;
        blk_status_t ret;
 
-       if (!write) {
-               ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA);
-               if (ret)
-                       return ret;
-       }
-
        if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)
                goto map;
 
-       if (write) {
+       if (btrfs_op(bio) == BTRFS_MAP_WRITE) {
                /* Check btrfs_submit_data_write_bio() for async submit rules */
                if (async_submit && !atomic_read(&BTRFS_I(inode)->sync_writers))
                        return btrfs_wq_submit_bio(inode, bio, 0, file_offset,
@@ -10314,12 +10298,6 @@ static blk_status_t submit_encoded_read_bio(struct btrfs_inode *inode,
                        return ret;
        }
 
-       ret = btrfs_bio_wq_end_io(fs_info, bio, BTRFS_WQ_ENDIO_DATA);
-       if (ret) {
-               btrfs_bio_free_csum(bbio);
-               return ret;
-       }
-
        atomic_inc(&priv->pending);
        ret = btrfs_map_bio(fs_info, bio, mirror_num);
        if (ret) {