Skip to content

Commit 508aebb

Browse files
damien-lemoalaxboe
authored andcommitted
block: introduce blk_queue_clear_zone_settings()
Introduce the internal function blk_queue_clear_zone_settings() to cleanup all limits and resources related to zoned block devices. This new function is called from blk_queue_set_zoned() when a disk zoned model is set to BLK_ZONED_NONE. This particular case can happens when a partition is created on a host-aware scsi disk. Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@edc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 0f1ba5f commit 508aebb

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

block/blk-settings.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,8 @@ void blk_queue_set_zoned(struct gendisk *disk, enum blk_zoned_model model)
910910
*/
911911
blk_queue_zone_write_granularity(q,
912912
queue_logical_block_size(q));
913+
} else {
914+
blk_queue_clear_zone_settings(q);
913915
}
914916
}
915917
EXPORT_SYMBOL_GPL(blk_queue_set_zoned);

block/blk-zoned.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,3 +549,20 @@ int blk_revalidate_disk_zones(struct gendisk *disk,
549549
return ret;
550550
}
551551
EXPORT_SYMBOL_GPL(blk_revalidate_disk_zones);
552+
553+
void blk_queue_clear_zone_settings(struct request_queue *q)
554+
{
555+
blk_mq_freeze_queue(q);
556+
557+
blk_queue_free_zone_bitmaps(q);
558+
blk_queue_flag_clear(QUEUE_FLAG_ZONE_RESETALL, q);
559+
q->required_elevator_features &= ~ELEVATOR_F_ZBD_SEQ_WRITE;
560+
q->nr_zones = 0;
561+
q->max_open_zones = 0;
562+
q->max_active_zones = 0;
563+
q->limits.chunk_sectors = 0;
564+
q->limits.zone_write_granularity = 0;
565+
q->limits.max_zone_append_sectors = 0;
566+
567+
blk_mq_unfreeze_queue(q);
568+
}

block/blk.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,10 @@ struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp);
334334

335335
#ifdef CONFIG_BLK_DEV_ZONED
336336
void blk_queue_free_zone_bitmaps(struct request_queue *q);
337+
void blk_queue_clear_zone_settings(struct request_queue *q);
337338
#else
338339
static inline void blk_queue_free_zone_bitmaps(struct request_queue *q) {}
340+
static inline void blk_queue_clear_zone_settings(struct request_queue *q) {}
339341
#endif
340342

341343
int blk_alloc_devt(struct block_device *part, dev_t *devt);

0 commit comments

Comments
 (0)