Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e89868a0 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

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: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent f479ea06

drivers/block/drbd/drbd_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -4437,7 +4437,7 @@ static int got_BarrierAck(struct drbd_conf *mdev, struct p_header80 *h) 


	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);

	}

drivers/block/drbd/drbd_worker.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ int w_start_resync(struct drbd_conf *mdev, 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 1;

}