Skip to content

Commit 9e1cc0a

Browse files
NeilBrownshligit
authored andcommitted
md: use mddev_suspend/resume instead of ->quiesce()
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 <[email protected]> Signed-off-by: Shaohua Li <[email protected]>
1 parent b3143b9 commit 9e1cc0a

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

drivers/md/md.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4866,8 +4866,8 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len)
48664866
mddev->pers->quiesce(mddev, 2);
48674867
} else {
48684868
/* Expanding suspended region - need to wait */
4869-
mddev->pers->quiesce(mddev, 1);
4870-
mddev->pers->quiesce(mddev, 0);
4869+
mddev_suspend(mddev);
4870+
mddev_resume(mddev);
48714871
}
48724872
err = 0;
48734873
unlock:
@@ -4910,8 +4910,8 @@ suspend_hi_store(struct mddev *mddev, const char *buf, size_t len)
49104910
mddev->pers->quiesce(mddev, 2);
49114911
} else {
49124912
/* Expanding suspended region - need to wait */
4913-
mddev->pers->quiesce(mddev, 1);
4914-
mddev->pers->quiesce(mddev, 0);
4913+
mddev_suspend(mddev);
4914+
mddev_resume(mddev);
49154915
}
49164916
err = 0;
49174917
unlock:
@@ -6642,7 +6642,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
66426642
struct bitmap *bitmap;
66436643

66446644
bitmap = bitmap_create(mddev, -1);
6645-
mddev->pers->quiesce(mddev, 1);
6645+
mddev_suspend(mddev);
66466646
if (!IS_ERR(bitmap)) {
66476647
mddev->bitmap = bitmap;
66486648
err = bitmap_load(mddev);
@@ -6652,11 +6652,11 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
66526652
bitmap_destroy(mddev);
66536653
fd = -1;
66546654
}
6655-
mddev->pers->quiesce(mddev, 0);
6655+
mddev_resume(mddev);
66566656
} else if (fd < 0) {
6657-
mddev->pers->quiesce(mddev, 1);
6657+
mddev_suspend(mddev);
66586658
bitmap_destroy(mddev);
6659-
mddev->pers->quiesce(mddev, 0);
6659+
mddev_resume(mddev);
66606660
}
66616661
}
66626662
if (fd < 0) {
@@ -6942,15 +6942,15 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
69426942
mddev->bitmap_info.space =
69436943
mddev->bitmap_info.default_space;
69446944
bitmap = bitmap_create(mddev, -1);
6945-
mddev->pers->quiesce(mddev, 1);
6945+
mddev_suspend(mddev);
69466946
if (!IS_ERR(bitmap)) {
69476947
mddev->bitmap = bitmap;
69486948
rv = bitmap_load(mddev);
69496949
} else
69506950
rv = PTR_ERR(bitmap);
69516951
if (rv)
69526952
bitmap_destroy(mddev);
6953-
mddev->pers->quiesce(mddev, 0);
6953+
mddev_resume(mddev);
69546954
} else {
69556955
/* remove the bitmap */
69566956
if (!mddev->bitmap) {
@@ -6973,9 +6973,9 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
69736973
mddev->bitmap_info.nodes = 0;
69746974
md_cluster_ops->leave(mddev);
69756975
}
6976-
mddev->pers->quiesce(mddev, 1);
6976+
mddev_suspend(mddev);
69776977
bitmap_destroy(mddev);
6978-
mddev->pers->quiesce(mddev, 0);
6978+
mddev_resume(mddev);
69796979
mddev->bitmap_info.offset = 0;
69806980
}
69816981
}

0 commit comments

Comments
 (0)