From 18807ec96cd7b96f7eb63740cac94e820600bc56 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Thu, 9 Dec 2010 14:23:27 +0100 Subject: [PATCH] --- yaml --- r: 242855 b: refs/heads/master c: 6184ea2145609b4ad63b141bf1f8124135ff4949 h: refs/heads/master i: 242853: 7a4599453565bfd48559cbf9ac22242690770f3c 242851: 17cf3f4538dbd9fe3f6d9c30b8ddacd156505e84 242847: 2d9de549113b67c18566576b32ab99be8e1a2403 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5304d1f7a513..8c6f7f766b80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb4379464efeb4624757e2cc0bf9207a309c1075 +refs/heads/master: 6184ea2145609b4ad63b141bf1f8124135ff4949 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 8088744d0ec1..00dcb1172ca8 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -2179,10 +2179,7 @@ static int drbd_asb_recover_0p(struct drbd_conf *mdev) __must_hold(local) static int drbd_asb_recover_1p(struct drbd_conf *mdev) __must_hold(local) { - int self, peer, hg, rv = -100; - - self = mdev->ldev->md.uuid[UI_BITMAP] & 1; - peer = mdev->p_uuid[UI_BITMAP] & 1; + int hg, rv = -100; switch (mdev->net_conf->after_sb_1p) { case ASB_DISCARD_YOUNGER_PRI: @@ -2231,10 +2228,7 @@ static int drbd_asb_recover_1p(struct drbd_conf *mdev) __must_hold(local) static int drbd_asb_recover_2p(struct drbd_conf *mdev) __must_hold(local) { - int self, peer, hg, rv = -100; - - self = mdev->ldev->md.uuid[UI_BITMAP] & 1; - peer = mdev->p_uuid[UI_BITMAP] & 1; + int hg, rv = -100; switch (mdev->net_conf->after_sb_2p) { case ASB_DISCARD_YOUNGER_PRI: