From 37307e4e79cb1ecbce5d9193477473ffbd725af8 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 18 Nov 2009 15:52:51 +0100 Subject: [PATCH] --- yaml --- r: 172969 b: refs/heads/master c: d8c2a36b774defd4e230353d91f0f609c128bd78 h: refs/heads/master i: 172967: e2fecbe8cb3e87771dbfb69c9e7143c99f4aad91 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7c01ddc51eb1..f156ec015458 100644 --- 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 index fb29a75053ef..c548f24f54a1 100644 --- 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)