2 files changed, 12 insertions, 6 deletions

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 5136510ec8b..2704af2ccf6 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -2421,15 +2421,17 @@ static inline void dec_ap_bio(struct drbd_conf *mdev)
         int ap_bio = atomic_dec_return(&mdev->ap_bio_cnt);
 
         D_ASSERT(ap_bio >= 0);
+
+        if (ap_bio == 0 && test_bit(BITMAP_IO, &mdev->flags)) {
+                if (!test_and_set_bit(BITMAP_IO_QUEUED, &mdev->flags))
+                        drbd_queue_work(&mdev->data.work, &mdev->bm_io_work.w);
+        }
+
         /* this currently does wake_up for every dec_ap_bio!
          * maybe rather introduce some type of hysteresis?
          * e.g. (ap_bio == mxb/2 || ap_bio == 0) ? */
         if (ap_bio < mxb)
                 wake_up(&mdev->misc_wait);
-        if (ap_bio == 0 && test_bit(BITMAP_IO, &mdev->flags)) {
-                if (!test_and_set_bit(BITMAP_IO_QUEUED, &mdev->flags))
-                        drbd_queue_work(&mdev->data.work, &mdev->bm_io_work.w);
-        }
 }
 
 static inline int drbd_set_ed_uuid(struct drbd_conf *mdev, u64 val)
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index a68d9bfb731..c47df7cf7f8 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1977,9 +1977,11 @@ static int drbd_nl_invalidate(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nl
         int retcode;
 
         /* If there is still bitmap IO pending, probably because of a previous
-         * resync just being finished, wait for it before requesting a new resync. */
+         * resync just being finished, wait for it before requesting a new resync.
+         * Also wait for it's after_state_ch(). */
         drbd_suspend_io(mdev);
         wait_event(mdev->misc_wait, !test_bit(BITMAP_IO, &mdev->flags));
+        drbd_flush_workqueue(mdev);
 
         retcode = _drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_T), CS_ORDERED);
 
@@ -2018,9 +2020,11 @@ static int drbd_nl_invalidate_peer(struct drbd_conf *mdev, struct drbd_nl_cfg_re
         int retcode;
 
         /* If there is still bitmap IO pending, probably because of a previous
-         * resync just being finished, wait for it before requesting a new resync. */
+         * resync just being finished, wait for it before requesting a new resync.
+         * Also wait for it's after_state_ch(). */
         drbd_suspend_io(mdev);
         wait_event(mdev->misc_wait, !test_bit(BITMAP_IO, &mdev->flags));
+        drbd_flush_workqueue(mdev);
 
         retcode = _drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_S), CS_ORDERED);