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

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

drbd: Restore the request restart logic 



It got lost with the commit 5a7bbad2
"block: remove support for bio remapping from ->make_request"

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

drivers/block/drbd/drbd_req.c

+4 −3
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ allocate_barrier: 


	if (is_susp(mdev->state)) {

		/* If we got suspended, use the retry mechanism of

		   generic_make_request() to restart processing of this

		   drbd_make_request() to restart processing of this

		   bio. In the next call to drbd_make_request

		   we sleep in inc_ap_bio() */

		ret = 1;
@@ -1102,8 +1102,9 @@ void drbd_make_request(struct request_queue *q, struct bio *bio) 
	e_enr = (bio->bi_sector+(bio->bi_size>>9)-1) >> HT_SHIFT;



	if (likely(s_enr == e_enr)) {

		do {

			inc_ap_bio(mdev, 1);

		drbd_make_request_common(mdev, bio, start_time);

		} while (drbd_make_request_common(mdev, bio, start_time));

		return;

	}