---

yaml --- r: 172969 b: refs/heads/master c: d8c2a36 h: refs/heads/master i: 172967: e2fecbe v: v3
git-mirror · Nov 24, 2009 · 37307e4 · 37307e4
1 parent 194e1e7
commit 37307e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b33a9164aca6332bf4a117af5528dea9675d782
+refs/heads/master: d8c2a36b774defd4e230353d91f0f609c128bd78
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -2400,6 +2400,7 @@ static int drbd_uuid_compare(struct drbd_conf *mdev, int *rule_nr) __must_hold(l
 
 
 	*rule_nr = 80;
+	peer = mdev->p_uuid[UI_CURRENT] & ~((u64)1);
 	for (i = UI_HISTORY_START; i <= UI_HISTORY_END; i++) {
 		self = mdev->ldev->md.uuid[i] & ~((u64)1);
 		if (self == peer)