Commit 6c3864e0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: use bio_is_zone_append() in the completion handler 



Otherwise it won't catch bios turned into regular writes by the block
level zone write plugging. The additional test it adds is for emulated
zone append.

Fixes: 9b1ce7f0 ("block: Implement zone append emulation")
CC: stable@vger.kernel.org # 6.12
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
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 d75d72a8

fs/btrfs/bio.c

+3 −3
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static void btrfs_simple_end_io(struct bio *bio) 
		INIT_WORK(&bbio->end_io_work, btrfs_end_bio_work);

		queue_work(btrfs_end_io_wq(fs_info, bio), &bbio->end_io_work);

	} else {

		if (bio_op(bio) == REQ_OP_ZONE_APPEND && !bio->bi_status)

		if (bio_is_zone_append(bio) && !bio->bi_status)

			btrfs_record_physical_zoned(bbio);

		btrfs_bio_end_io(bbio, bbio->bio.bi_status);

	}
@@ -398,7 +398,7 @@ static void btrfs_orig_write_end_io(struct bio *bio) 
	else

		bio->bi_status = BLK_STS_OK;



	if (bio_op(bio) == REQ_OP_ZONE_APPEND && !bio->bi_status)

	if (bio_is_zone_append(bio) && !bio->bi_status)

		stripe->physical = bio->bi_iter.bi_sector << SECTOR_SHIFT;



	btrfs_bio_end_io(bbio, bbio->bio.bi_status);
@@ -412,7 +412,7 @@ static void btrfs_clone_write_end_io(struct bio *bio) 
	if (bio->bi_status) {

		atomic_inc(&stripe->bioc->error);

		btrfs_log_dev_io_error(bio, stripe->dev);

	} else if (bio_op(bio) == REQ_OP_ZONE_APPEND) {

	} else if (bio_is_zone_append(bio)) {

		stripe->physical = bio->bi_iter.bi_sector << SECTOR_SHIFT;

	}