md/bitmap: use mddev_suspend/resume instead of ->quiesce() (f8f83d8f) · Commits · 戴 / test

After ("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 <jinpu.wang@profitbricks.com> Reviewed-by:

Gioh Kim <gi-oh.kim@profitbricks.com> Signed-off-by:

Shaohua Li <shli@fb.com>

drivers/md/md-bitmap.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -2288,9 +2288,9 @@ location_store(struct mddev mddev, const char buf, size_t len)
		goto out;
		}
		if (mddev->pers) {
		mddev->pers->quiesce(mddev, 1);
		mddev_suspend(mddev);
		md_bitmap_destroy(mddev);
		mddev->pers->quiesce(mddev, 0);
		mddev_resume(mddev);
		}
		mddev->bitmap_info.offset = 0;
		if (mddev->bitmap_info.file) {
		@@ -2327,8 +2327,8 @@ location_store(struct mddev mddev, const char buf, size_t len)
		mddev->bitmap_info.offset = offset;
		if (mddev->pers) {
		struct bitmap *bitmap;
		mddev->pers->quiesce(mddev, 1);
		bitmap = md_bitmap_create(mddev, -1);
		mddev_suspend(mddev);
		if (IS_ERR(bitmap))
		rv = PTR_ERR(bitmap);
		else {
		@@ -2337,11 +2337,12 @@ location_store(struct mddev mddev, const char buf, size_t len)
		if (rv)
		mddev->bitmap_info.offset = 0;
		}
		mddev->pers->quiesce(mddev, 0);
		if (rv) {
		md_bitmap_destroy(mddev);
		mddev_resume(mddev);
		goto out;
		}
		mddev_resume(mddev);
		}
		}
		}

Admin message