From: Philipp Reisner Date: Wed, 18 Nov 2009 14:52:51 +0000 (+0100) Subject: Fixed a regression in resync decission code drbd_uuid_compare() [Bugz 260] X-Git-Tag: 2.1b_release~10246^2~46^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8c2a36b774defd4e230353d91f0f609c128bd78;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git 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 Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index fb29a75..c548f24 100644 --- 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)