[dm-devel] [PATCH -next v3 16/25] md/raid5: use new apis to suspend array for raid5_change_consistency_policy()

[Yu Kuai]

From: Yu Kuai <yuku...@huawei.com>

Convert to use new apis, the old apis will be removed eventually.

This is not hot path, so performance is not concerned.

Signed-off-by: Yu Kuai <yuku...@huawei.com>
---
 drivers/md/raid5.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 8060d29e99d2..e6b8c0145648 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -8967,12 +8967,12 @@ static int raid5_change_consistency_policy(struct mddev 
*mddev, const char *buf)
        struct r5conf *conf;
        int err;
 
-       err = mddev_lock(mddev);
+       err = mddev_suspend_and_lock(mddev);
        if (err)
                return err;
        conf = mddev->private;
        if (!conf) {
-               mddev_unlock(mddev);
+               mddev_unlock_and_resume(mddev);
                return -ENODEV;
        }
 
@@ -8982,19 +8982,14 @@ static int raid5_change_consistency_policy(struct mddev 
*mddev, const char *buf)
                        err = log_init(conf, NULL, true);
                        if (!err) {
                                err = resize_stripes(conf, conf->pool_size);
-                               if (err) {
-                                       mddev_suspend(mddev);
+                               if (err)
                                        log_exit(conf);
-                                       mddev_resume(mddev);
-                               }
                        }
                } else
                        err = -EINVAL;
        } else if (strncmp(buf, "resync", 6) == 0) {
                if (raid5_has_ppl(conf)) {
-                       mddev_suspend(mddev);
                        log_exit(conf);
-                       mddev_resume(mddev);
                        err = resize_stripes(conf, conf->pool_size);
                } else if (test_bit(MD_HAS_JOURNAL, &conf->mddev->flags) &&
                           r5l_log_disk_error(conf)) {
@@ -9007,11 +9002,9 @@ static int raid5_change_consistency_policy(struct mddev 
*mddev, const char *buf)
                                        break;
                                }
 
-                       if (!journal_dev_exists) {
-                               mddev_suspend(mddev);
+                       if (!journal_dev_exists)
                                clear_bit(MD_HAS_JOURNAL, &mddev->flags);
-                               mddev_resume(mddev);
-                       } else  /* need remove journal device first */
+                       else  /* need remove journal device first */
                                err = -EBUSY;
                } else
                        err = -EINVAL;
@@ -9022,7 +9015,7 @@ static int raid5_change_consistency_policy(struct mddev 
*mddev, const char *buf)
        if (!err)
                md_update_sb(mddev, 1);
 
-       mddev_unlock(mddev);
+       mddev_unlock_and_resume(mddev);
 
        return err;
 }
-- 
2.39.2

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel