diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2009-11-18 15:52:51 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2009-11-24 18:13:28 +0100 |
| commit | d8c2a36b774defd4e230353d91f0f609c128bd78 (patch) | |
| tree | f9e3f64b763945db7bc0a007c03b28833177e0b4 /drivers/block | |
| parent | add missing state change on corrupt packet header in drbd_recv_header (diff) | |
| download | linux-d8c2a36b774defd4e230353d91f0f609c128bd78.tar.xz linux-d8c2a36b774defd4e230353d91f0f609c128bd78.zip | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index fb29a75053ef..c548f24f54a1 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) |