drbd: Fixed an obvious copy-n-paste mistake
authorPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 10 Nov 2011 13:27:34 +0000 (14:27 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:06 +0000 (16:58 +0100)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_receiver.c
drivers/block/drbd/drbd_worker.c

index ed1fa3f7cc4e395e82c79acaee391f5f8f0cc7b0..4cdf8a75d71b8dd6f0cebef53c95d42d8dedccfb 100644 (file)
@@ -4984,7 +4984,7 @@ static int got_BarrierAck(struct drbd_tconn *tconn, struct packet_info *pi)
 
        if (mdev->state.conn == C_AHEAD &&
            atomic_read(&mdev->ap_in_flight) == 0 &&
-           !test_and_set_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags)) {
+           !test_and_set_bit(AHEAD_TO_SYNC_SOURCE, &mdev->flags)) {
                mdev->start_resync_timer.expires = jiffies + HZ;
                add_timer(&mdev->start_resync_timer);
        }
index bc2cfd6c600f323631ed51f026ed9aaccc325903..e263a5f4aac5df1320b2b5908a60b3439af68d84 100644 (file)
@@ -1518,7 +1518,7 @@ int w_start_resync(struct drbd_work *w, int cancel)
        }
 
        drbd_start_resync(mdev, C_SYNC_SOURCE);
-       clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->current_epoch->flags);
+       clear_bit(AHEAD_TO_SYNC_SOURCE, &mdev->flags);
        return 0;
 }