2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index bbe3bff2cad6..8bfedc7164fa 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -3763,6 +3763,9 @@ static int w_go_diskless(struct drbd_conf *mdev, struct drbd_work *w, int unused
          * the protected members anymore, though, so in the after_state_ch work
          * it will be safe to free them. */
         drbd_force_state(mdev, NS(disk, D_DISKLESS));
+        /* We need to wait for return of references checked out while we still
+         * have been D_FAILED, though (drbd_md_sync, bitmap io). */
+        wait_event(mdev->misc_wait, !atomic_read(&mdev->local_cnt));
 
         clear_bit(GO_DISKLESS, &mdev->flags);
         return 1;
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index da7d9bd4f3f0..9b2a0158f399 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -53,7 +53,7 @@
 
 
 extern const char *drbd_buildtag(void);
-#define REL_VERSION "8.3.9rc1"
+#define REL_VERSION "8.3.9rc2"
 #define API_VERSION 88
 #define PRO_VERSION_MIN 86
 #define PRO_VERSION_MAX 95