3 files changed, 27 insertions, 6 deletions

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index ab20c0062d21..e0e08f5e0a76 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -829,6 +829,7 @@ enum {
                                  * the peer, if it changed there as well. */
         CONN_DRY_RUN,           /* Expect disconnect after resync handshake. */
         GOT_PING_ACK,           /* set when we receive a ping_ack packet, misc wait gets woken */
+        NEW_CUR_UUID,           /* Create new current UUID when thawing IO */
 };
 
 struct drbd_bitmap; /* opaque for drbd_conf */
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 40baddd94a5b..440b1d5dcfe2 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1252,12 +1252,23 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
         }
 
         if (fp == FP_STONITH && ns.susp) {
-                /* case1: The outdate peer handler is successful:
-                 * case2: The connection was established again: */
-                if ((os.pdsk > D_OUTDATED  && ns.pdsk <= D_OUTDATED) ||
-                    (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED)) {
+                /* case1: The outdate peer handler is successful: */
+                if (os.pdsk > D_OUTDATED  && ns.pdsk <= D_OUTDATED) {
                         tl_clear(mdev);
+                        if (test_bit(NEW_CUR_UUID, &mdev->flags)) {
+                                drbd_uuid_new_current(mdev);
+                                clear_bit(NEW_CUR_UUID, &mdev->flags);
+                                drbd_md_sync(mdev);
+                        }
+                        spin_lock_irq(&mdev->req_lock);
+                        _drbd_set_state(_NS(mdev, susp, 0), CS_VERBOSE, NULL);
+                        spin_unlock_irq(&mdev->req_lock);
+                }
+                /* case2: The connection was established again: */
+                if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED) {
+                        clear_bit(NEW_CUR_UUID, &mdev->flags);
                         spin_lock_irq(&mdev->req_lock);
+                        _tl_restart(mdev, resend);
                         _drbd_set_state(_NS(mdev, susp, 0), CS_VERBOSE, NULL);
                         spin_unlock_irq(&mdev->req_lock);
                 }
@@ -1280,8 +1291,12 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
                 if (get_ldev(mdev)) {
                         if ((ns.role == R_PRIMARY || ns.peer == R_PRIMARY) &&
                             mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE) {
-                                drbd_uuid_new_current(mdev);
-                                drbd_send_uuids(mdev);
+                                if (mdev->state.susp) {
+                                        set_bit(NEW_CUR_UUID, &mdev->flags);
+                                } else {
+                                        drbd_uuid_new_current(mdev);
+                                        drbd_send_uuids(mdev);
+                                }
                         }
                         put_ldev(mdev);
                 }
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 32d00720470b..d764f3cd5866 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1810,6 +1810,11 @@ static int drbd_nl_suspend_io(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nl
 static int drbd_nl_resume_io(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
                              struct drbd_nl_cfg_reply *reply)
 {
+        if (test_bit(NEW_CUR_UUID, &mdev->flags)) {
+                drbd_uuid_new_current(mdev);
+                clear_bit(NEW_CUR_UUID, &mdev->flags);
+                drbd_md_sync(mdev);
+        }
         drbd_suspend_io(mdev);
         reply->ret_code = drbd_request_state(mdev, NS(susp, 0));
         if (reply->ret_code == SS_SUCCESS) {