diff options
| author |  Christoph Hellwig <hch@lst.de>
| 2024-05-27 14:36:18 +0200 |
|---|---|---|
| committer |  Jens Axboe <axboe@kernel.dk>
| 2024-05-27 09:16:39 -0600 |
| commit | d9780064b163b91c28e4d44ec3115599db65b7fa (patch) | |
| tree | 3834df8bc051dbf500cbdaa2876c7cf6655bed75 /drivers/md | |
| parent | block: remove blk_queue_max_integrity_segments (diff) | |
| download | linux-d9780064b163b91c28e4d44ec3115599db65b7fa.tar.gz linux-d9780064b163b91c28e4d44ec3115599db65b7fa.tar.bz2 linux-d9780064b163b91c28e4d44ec3115599db65b7fa.zip | |
dm: move setting zoned_enabled to dm_table_set_restrictions
Keep it together with the rest of the zoned code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20240527123634.1116952-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-table.c | 3 | ||||
| -rw-r--r-- | drivers/md/dm-zone.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index cc66a27c363a..e291b78b307b 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -2040,9 +2040,6 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, r = dm_set_zones_restrictions(t, q); if (r) return r; - if (blk_queue_is_zoned(q) && - !static_key_enabled(&zoned_enabled.key)) - static_branch_enable(&zoned_enabled); } dm_update_crypto_profile(q, t); diff --git a/drivers/md/dm-zone.c b/drivers/md/dm-zone.c index 8e6bcb0d786a..3103360ce7f0 100644 --- a/drivers/md/dm-zone.c +++ b/drivers/md/dm-zone.c @@ -287,7 +287,13 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q) queue_emulates_zone_append(q) ? "emulated" : "native"); } - return dm_revalidate_zones(md, t); + ret = dm_revalidate_zones(md, t); + if (ret < 0) + return ret; + + if (!static_key_enabled(&zoned_enabled.key)) + static_branch_enable(&zoned_enabled); + return 0; } /* |