Skip to content

Commit f8f83d8

Browse files
Jack Wangshligit
authored andcommitted
md/bitmap: use mddev_suspend/resume instead of ->quiesce()
After 9e1cc0a ("md: use mddev_suspend/resume instead of ->quiesce()") We still have similar left in bitmap functions. Replace quiesce() with mddev_suspend/resume. Also move md_bitmap_create out of mddev_suspend. and move mddev_resume after md_bitmap_destroy. as we did in set_bitmap_file. Signed-off-by: Jack Wang <[email protected]> Reviewed-by: Gioh Kim <[email protected]> Signed-off-by: Shaohua Li <[email protected]>
1 parent 116d99a commit f8f83d8

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/md/md-bitmap.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2288,9 +2288,9 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
22882288
goto out;
22892289
}
22902290
if (mddev->pers) {
2291-
mddev->pers->quiesce(mddev, 1);
2291+
mddev_suspend(mddev);
22922292
md_bitmap_destroy(mddev);
2293-
mddev->pers->quiesce(mddev, 0);
2293+
mddev_resume(mddev);
22942294
}
22952295
mddev->bitmap_info.offset = 0;
22962296
if (mddev->bitmap_info.file) {
@@ -2327,8 +2327,8 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
23272327
mddev->bitmap_info.offset = offset;
23282328
if (mddev->pers) {
23292329
struct bitmap *bitmap;
2330-
mddev->pers->quiesce(mddev, 1);
23312330
bitmap = md_bitmap_create(mddev, -1);
2331+
mddev_suspend(mddev);
23322332
if (IS_ERR(bitmap))
23332333
rv = PTR_ERR(bitmap);
23342334
else {
@@ -2337,11 +2337,12 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
23372337
if (rv)
23382338
mddev->bitmap_info.offset = 0;
23392339
}
2340-
mddev->pers->quiesce(mddev, 0);
23412340
if (rv) {
23422341
md_bitmap_destroy(mddev);
2342+
mddev_resume(mddev);
23432343
goto out;
23442344
}
2345+
mddev_resume(mddev);
23452346
}
23462347
}
23472348
}

0 commit comments

Comments
 (0)