[PATCH 5/9] md/raid0: use the atomic queue limit update APIs

[Christoph Hellwig]

Build the queue limits outside the queue and apply them using
queue_limits_set.  Also remove the bogus ->gendisk and ->queue NULL
checks in the are while touching it.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 drivers/md/raid0.c | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index c50a7abda744ad..f7d78ee5338bd3 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -381,6 +381,7 @@ static void raid0_free(struct mddev *mddev, void *priv)
 
 static int raid0_run(struct mddev *mddev)
 {
+       struct queue_limits lim;
        struct r0conf *conf;
        int ret;
 
@@ -391,29 +392,23 @@ static int raid0_run(struct mddev *mddev)
        if (md_check_no_bitmap(mddev))
                return -EINVAL;
 
-       /* if private is not null, we are here after takeover */
-       if (mddev->private == NULL) {
+       /* if conf is not null, we are here after takeover */
+       if (!conf) {
                ret = create_strip_zones(mddev, &conf);
                if (ret < 0)
                        return ret;
                mddev->private = conf;
        }
-       conf = mddev->private;
-       if (mddev->queue) {
-               struct md_rdev *rdev;
-
-               blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors);
-               blk_queue_max_write_zeroes_sectors(mddev->queue, 
mddev->chunk_sectors);
-
-               blk_queue_io_min(mddev->queue, mddev->chunk_sectors << 9);
-               blk_queue_io_opt(mddev->queue,
-                                (mddev->chunk_sectors << 9) * 
mddev->raid_disks);
 
-               rdev_for_each(rdev, mddev) {
-                       disk_stack_limits(mddev->gendisk, rdev->bdev,
-                                         rdev->data_offset << 9);
-               }
-       }
+       blk_set_stacking_limits(&lim);
+       lim.max_hw_sectors = mddev->chunk_sectors;
+       lim.max_write_zeroes_sectors = mddev->chunk_sectors;
+       lim.io_min = mddev->chunk_sectors << 9;
+       lim.io_opt = lim.io_min * mddev->raid_disks;
+       mddev_stack_rdev_limits(mddev, &lim);
+       ret = queue_limits_set(mddev->queue, &lim);
+       if (ret)
+               goto out_free_conf;
 
        /* calculate array device size */
        md_set_array_sectors(mddev, raid0_size(mddev, 0, 0));
@@ -426,8 +421,10 @@ static int raid0_run(struct mddev *mddev)
 
        ret = md_integrity_register(mddev);
        if (ret)
-               free_conf(mddev, conf);
-
+               goto out_free_conf;
+       return 0;
+out_free_conf:
+       free_conf(mddev, conf);
        return ret;
 }
 
-- 
2.39.2