Fixed a regression in resync decission code drbd_uuid_compare() [Bugz 260]

Since 8.3.3 we fail to do the resync when a partial resynch is not
possible, but a full synch is necessary.

This regression was introduced with 7101539930c0a89146959e7a39c09ad9c3516434

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index fb29a75053ef28771982d28cc9f91f5a15b3a7d8..c548f24f54a19a8262bce0f4200a54291b84cbca 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/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)