aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-11-09 15:04:03 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-05-09 09:15:57 -0400
commite89868a0927cfb8a3f535c938e5d6dd7edc6353c (patch)
treee1f9fcad718008ca1591ba87eac7b2d5d87f9cd0 /drivers/block/drbd
parentf479ea06613514814449f28cba6488e31698e406 (diff)
drbd: Fixed an obvious copy-n-paste mistake
This bug might have caused troubles if disk-barriers and the ahead-behind more are enabled at the same time. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
-rw-r--r--drivers/block/drbd/drbd_worker.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index f0d86cb300cf..2e9dfc69828f 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4437,7 +4437,7 @@ static int got_BarrierAck(struct drbd_conf *mdev, struct p_header80 *h)
4437 4437
4438 if (mdev->state.conn == C_AHEAD && 4438 if (mdev->state.conn == C_AHEAD &&
4439 atomic_read(&mdev->ap_in_flight) == 0 && 4439 atomic_read(&mdev->ap_in_flight) == 0 &&
4440 !test_and_set_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags)) { 4440 !test_and_set_bit(AHEAD_TO_SYNC_SOURCE, &mdev->flags)) {
4441 mdev->start_resync_timer.expires = jiffies + HZ; 4441 mdev->start_resync_timer.expires = jiffies + HZ;
4442 add_timer(&mdev->start_resync_timer); 4442 add_timer(&mdev->start_resync_timer);
4443 } 4443 }
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 5fc60f622bed..56fd69e38298 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -746,7 +746,7 @@ int w_start_resync(struct drbd_conf *mdev, struct drbd_work *w, int cancel)
746 } 746 }
747 747
748 drbd_start_resync(mdev, C_SYNC_SOURCE); 748 drbd_start_resync(mdev, C_SYNC_SOURCE);
749 clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags); 749 clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->flags);
750 return 1; 750 return 1;
751} 751}
752 752