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

Commit 5a75cc7c authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Fixed compatibility with protocol versions smaller than 95 



Forgot to consider the max size for the resync requests.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent f2906e18

drivers/block/drbd/drbd_worker.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -534,8 +534,9 @@ int w_make_resync_request(struct drbd_conf *mdev, 




	/* starting with drbd 8.3.8, we can handle multi-bio EEs,

	/* starting with drbd 8.3.8, we can handle multi-bio EEs,

	 * if it should be necessary */

	 * if it should be necessary */

	max_segment_size = mdev->agreed_pro_version < 94 ?

	max_segment_size =

		queue_max_segment_size(mdev->rq_queue) : DRBD_MAX_SEGMENT_SIZE;

		mdev->agreed_pro_version < 94 ? queue_max_segment_size(mdev->rq_queue) :

		mdev->agreed_pro_version < 95 ?	DRBD_MAX_SIZE_H80_PACKET : DRBD_MAX_SEGMENT_SIZE;





	if (mdev->rs_plan_s.size) { /* mdev->sync_conf.c_plan_ahead */

	if (mdev->rs_plan_s.size) { /* mdev->sync_conf.c_plan_ahead */

		number = drbd_rs_controller(mdev) >> (BM_BLOCK_SHIFT - 9);

		number = drbd_rs_controller(mdev) >> (BM_BLOCK_SHIFT - 9);