Commit 73672710 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

btrfs: zoned: drop redundant check for REQ_OP_ZONE_APPEND and btrfs_is_zoned 



REQ_OP_ZONE_APPEND can only work on zoned devices, so it is redundant to
check if the filesystem is zoned when REQ_OP_ZONE_APPEND is set as the
bio's bio_op.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 554aed7d

fs/btrfs/extent_io.c

+2 −3
Original line number Diff line number Diff line
@@ -3283,8 +3283,7 @@ static int calc_bio_boundaries(struct btrfs_bio_ctrl *bio_ctrl, 
	else

		bio_ctrl->len_to_stripe_boundary = (u32)geom.len;



	if (!btrfs_is_zoned(fs_info) ||

	    bio_op(bio_ctrl->bio) != REQ_OP_ZONE_APPEND) {

	if (bio_op(bio_ctrl->bio) != REQ_OP_ZONE_APPEND) {

		bio_ctrl->len_to_oe_boundary = U32_MAX;

		return 0;

	}
@@ -3339,7 +3338,7 @@ static int alloc_new_bio(struct btrfs_inode *inode, 
		bio_set_dev(bio, bdev);

		wbc_init_bio(wbc, bio);

	}

	if (btrfs_is_zoned(fs_info) && bio_op(bio) == REQ_OP_ZONE_APPEND) {

	if (bio_op(bio) == REQ_OP_ZONE_APPEND) {

		struct btrfs_device *device;



		device = btrfs_zoned_get_device(fs_info, disk_bytenr,