---

yaml --- r: 346113 b: refs/heads/master c: 97af09d h: refs/heads/master i: 346111: d15aff1 v: v3
git-mirror · Nov 8, 2012 · f3854ad · f3854ad
1 parent 00e22da
commit f3854ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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.