From f3854ad6b02ef635831dda28ce819b8191d87214 Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Fri, 15 Jul 2011 12:14:27 +0200
Subject: [PATCH] --- yaml --- r: 346113 b: refs/heads/master c:
 97af09d51ee1ca4a8687b4c3492a1739384d5a42 h: refs/heads/master i:   346111:
 d15aff18d8d0cc2de217a2b2cea0e1a38dcb9ec8 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/block/drbd/drbd_state.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 93d7194e194f..da54a8aafc25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: accdbcc5f94ec631aa49eb8efd14b3ddd0626191
+refs/heads/master: 97af09d51ee1ca4a8687b4c3492a1739384d5a42
diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c
index eafc19532e15..1763357a065a 100644
--- a/trunk/drivers/block/drbd/drbd_state.c
+++ b/trunk/drivers/block/drbd/drbd_state.c
@@ -1239,11 +1239,6 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
 	}
 
 	if (ns.pdsk < D_INCONSISTENT && get_ldev(mdev)) {
-		if (ns.peer == R_PRIMARY && mdev->ldev->md.uuid[UI_BITMAP] == 0) {
-			drbd_uuid_new_current(mdev);
-			drbd_send_uuids(mdev);
-		}
-
 		/* D_DISKLESS Peer becomes secondary */
 		if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY)
 			/* We may still be Primary ourselves.