md: use mddev_suspend/resume instead of ->quiesce()

commit 9e1cc0a54556a6c63dc0cfb7cd7d60d43337bba6 upstream.

mddev_suspend() is a more general interface than
calling ->quiesce() and is so more extensible.  A
future patch will make use of this.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Jack Wang <jinpu.wang@profitbricks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 06ad5d798d732912b93d2aea06496cee727ba06e..3d1650db2064c8aa02c071d27a331fa27ef0967e 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4870,8 +4870,8 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len)
                mddev->pers->quiesce(mddev, 2);
        } else {
                /* Expanding suspended region - need to wait */
-               mddev->pers->quiesce(mddev, 1);
-               mddev->pers->quiesce(mddev, 0);
+               mddev_suspend(mddev);
+               mddev_resume(mddev);
        }
        err = 0;
 unlock:
@@ -4914,8 +4914,8 @@ suspend_hi_store(struct mddev *mddev, const char *buf, size_t len)
                mddev->pers->quiesce(mddev, 2);
        } else {
                /* Expanding suspended region - need to wait */
-               mddev->pers->quiesce(mddev, 1);
-               mddev->pers->quiesce(mddev, 0);
+               mddev_suspend(mddev);
+               mddev_resume(mddev);
        }
        err = 0;
 unlock:
@@ -6666,7 +6666,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
                        struct bitmap *bitmap;
 
                        bitmap = bitmap_create(mddev, -1);
-                       mddev->pers->quiesce(mddev, 1);
+                       mddev_suspend(mddev);
                        if (!IS_ERR(bitmap)) {
                                mddev->bitmap = bitmap;
                                err = bitmap_load(mddev);
@@ -6676,11 +6676,11 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
                                bitmap_destroy(mddev);
                                fd = -1;
                        }
-                       mddev->pers->quiesce(mddev, 0);
+                       mddev_resume(mddev);
                } else if (fd < 0) {
-                       mddev->pers->quiesce(mddev, 1);
+                       mddev_suspend(mddev);
                        bitmap_destroy(mddev);
-                       mddev->pers->quiesce(mddev, 0);
+                       mddev_resume(mddev);
                }
        }
        if (fd < 0) {
@@ -6966,7 +6966,7 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
                        mddev->bitmap_info.space =
                                mddev->bitmap_info.default_space;
                        bitmap = bitmap_create(mddev, -1);
-                       mddev->pers->quiesce(mddev, 1);
+                       mddev_suspend(mddev);
                        if (!IS_ERR(bitmap)) {
                                mddev->bitmap = bitmap;
                                rv = bitmap_load(mddev);
@@ -6974,7 +6974,7 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
                                rv = PTR_ERR(bitmap);
                        if (rv)
                                bitmap_destroy(mddev);
-                       mddev->pers->quiesce(mddev, 0);
+                       mddev_resume(mddev);
                } else {
                        /* remove the bitmap */
                        if (!mddev->bitmap) {
@@ -6997,9 +6997,9 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
                                mddev->bitmap_info.nodes = 0;
                                md_cluster_ops->leave(mddev);
                        }
-                       mddev->pers->quiesce(mddev, 1);
+                       mddev_suspend(mddev);
                        bitmap_destroy(mddev);
-                       mddev->pers->quiesce(mddev, 0);
+                       mddev_resume(mddev);
                        mddev->bitmap_info.offset = 0;
                }
        }