summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2011-01-21 22:53:48 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 11:48:07 +0100
commit873b0d5f98ab70e4df7a62b2ef0305373f88f330 (patch)
tree28f36e0d6eb1352b842c403d68908dc4246c7604 /drivers/block
parente636db5b956950b8b9bfbeb766a637f84bae1e3b (diff)
downloadblackbird-op-linux-873b0d5f98ab70e4df7a62b2ef0305373f88f330.tar.gz
blackbird-op-linux-873b0d5f98ab70e4df7a62b2ef0305373f88f330.zip
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: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_nl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index bc0bcb964603..87aaa7fc4d27 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -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));
OpenPOWER on IntegriCloud