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

Commit 873b0d5f authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: serialize admin requests for new verify run with pending bitmap io 



This is an addendum to
 drbd: serialize admin requests for new resync with pending bitmap io

It avoids a race that could trigger "FIXME" assert log messages.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent e636db5b

drivers/block/drbd/drbd_nl.c

+5 −0
Original line number Diff line number Diff line
@@ -2106,6 +2106,11 @@ static int drbd_nl_start_ov(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, 
		reply->ret_code = ERR_MANDATORY_TAG;

		return 0;

	}



	/* If there is still bitmap IO pending, e.g. previous resync or verify

	 * just being finished, wait for it before requesting a new resync. */

	wait_event(mdev->misc_wait, !test_bit(BITMAP_IO, &mdev->flags));



	/* w_make_ov_request expects position to be aligned */

	mdev->ov_start_sector = args.start_sector & ~BM_SECT_PER_BIT;

	reply->ret_code = drbd_request_state(mdev,NS(conn,C_VERIFY_S));