OSDN Git Service

btrfs: zoned: drop redundant check for REQ_OP_ZONE_APPEND and btrfs_is_zoned
authorJohannes Thumshirn <johannes.thumshirn@wdc.com>
Tue, 7 Dec 2021 14:28:37 +0000 (06:28 -0800)
committerDavid Sterba <dsterba@suse.com>
Fri, 7 Jan 2022 13:18:26 +0000 (14:18 +0100)
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: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent_io.c

index 790d325..38c5e9e 100644 (file)
@@ -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,