diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-06-19 08:02:34 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-06-19 08:14:49 -0600 |
| commit | 69c34f07e45f2d52d9a41991867a1e5a85bbaaf3 (patch) | |
| tree | dc4779c7ed7a5f17ddf67182399111815da27100 /drivers/md/dm-zone.c | |
| parent | 465478bb00168a7620788990b1679c5067d421f2 (diff) | |
| parent | 339d3948c07b4aa2940aeb874294a7d6782cec16 (diff) | |
Merge branch 'for-6.11/block-limits' into for-6.11/block
Merge in last round of queue limits changes from Christoph.
* for-6.11/block-limits: (26 commits)
block: move the bounce flag into the features field
block: move the skip_tagset_quiesce flag to queue_limits
block: move the pci_p2pdma flag to queue_limits
block: move the zone_resetall flag to queue_limits
block: move the zoned flag into the features field
block: move the poll flag to queue_limits
block: move the dax flag to queue_limits
block: move the nowait flag to queue_limits
block: move the synchronous flag to queue_limits
block: move the stable_writes flag to queue_limits
block: move the io_stat flag setting to queue_limits
block: move the add_random flag to queue_limits
block: move the nonrot flag to queue_limits
block: move cache control settings out of queue->flags
block: remove blk_flush_policy
block: freeze the queue in queue_attr_store
nbd: move setting the cache control flags to __nbd_set_size
virtio_blk: remove virtblk_update_cache_mode
loop: fold loop_update_rotational into loop_reconfigure_limits
loop: also use the default block size from an underlying block device
...
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/dm-zone.c')
| -rw-r--r-- | drivers/md/dm-zone.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c index 70719bf32a2e..4d37e53b50ee 100644 --- a/drivers/md/dm-zone.c +++ b/drivers/md/dm-zone.c @@ -372,7 +372,7 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q, lim->max_zone_append_sectors = 0; lim->zone_write_granularity = 0; lim->chunk_sectors = 0; - lim->zoned = false; + lim->features &= ~BLK_FEAT_ZONED; clear_bit(DMF_EMULATE_ZONE_APPEND, &md->flags); md->nr_zones = 0; disk->nr_zones = 0; @@ -392,7 +392,8 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q, DMWARN("%s zone resource limits may be unreliable", disk->disk_name); - if (lim->zoned && !static_key_enabled(&zoned_enabled.key)) + if (lim->features & BLK_FEAT_ZONED && + !static_key_enabled(&zoned_enabled.key)) static_branch_enable(&zoned_enabled); return 0; } |