Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c435e22 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

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: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarJack Wang <jinpu.wang@profitbricks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent feabea21

drivers/md/md.c

+12 −12
Original line number Diff line number Diff line
@@ -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;

		}

	}