Commit 112397ac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: open code btrfs_bio_end_io in btrfs_dio_submit_io 



btrfs_dio_submit_io is the only place that uses btrfs_bio_end_io to end a
bio that hasn't been submitted using btrfs_submit_bio yet, and this
invariant will become a problem with upcoming changes to the btrfs bio
layer.  Just open code the assignment of bi_status and the call to
btrfs_dio_end_io.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent fbe96087

fs/btrfs/inode.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -7845,7 +7845,8 @@ static void btrfs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio, 




		ret = btrfs_extract_ordered_extent(bbio, dio_data->ordered);

		ret = btrfs_extract_ordered_extent(bbio, dio_data->ordered);

		if (ret) {

		if (ret) {

			btrfs_bio_end_io(bbio, errno_to_blk_status(ret));

			bbio->bio.bi_status = errno_to_blk_status(ret);

			btrfs_dio_end_io(bbio);

			return;

			return;

		}

		}

	}

	}