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>

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index cc66a27c363a65f2e034706ff0073b327d71f14b..e291b78b307b13701ff6d9fa9864773b800b581d 100644 (file)
--- 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 8e6bcb0d786a1ae7f1ab20ccee16138dd63be01c..3103360ce7f04011d9b020a2d36c0ae9758314bb 100644 (file)
--- 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;
 }
 
 /*