Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / drivers / block / null_blk / zoned.c

diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c
index fce0a54df0e5ff4a204e98106451c5b9bc6cfb29..bfcab1c782b530fc348da5c41a89e80efab7cbbf 100644 (file)
--- a/drivers/block/null_blk/zoned.c
+++ b/drivers/block/null_blk/zoned.c
@@ -148,10 +148,6 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q)
                sector += dev->zone_size_sects;
        }
 
-       q->limits.zoned = BLK_ZONED_HM;
-       blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q);
-       blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE);
-
        return 0;
 }
 
@@ -160,6 +156,10 @@ int null_register_zoned_dev(struct nullb *nullb)
        struct nullb_device *dev = nullb->dev;
        struct request_queue *q = nullb->q;
 
+       blk_queue_set_zoned(nullb->disk, BLK_ZONED_HM);
+       blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q);
+       blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE);
+
        if (queue_is_mq(q)) {
                int ret = blk_revalidate_disk_zones(nullb->disk, NULL);