mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
drbd: Restore the request restart logic
It got lost with the commit 5a7bbad27a
"block: remove support for bio remapping from ->make_request"
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
parent
9476f39d66
commit
f6d0a8dbfd
1 changed files with 4 additions and 3 deletions
|
@ -871,7 +871,7 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns
|
||||||
|
|
||||||
if (is_susp(mdev->state)) {
|
if (is_susp(mdev->state)) {
|
||||||
/* If we got suspended, use the retry mechanism of
|
/* 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
|
bio. In the next call to drbd_make_request
|
||||||
we sleep in inc_ap_bio() */
|
we sleep in inc_ap_bio() */
|
||||||
ret = 1;
|
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;
|
e_enr = (bio->bi_sector+(bio->bi_size>>9)-1) >> HT_SHIFT;
|
||||||
|
|
||||||
if (likely(s_enr == e_enr)) {
|
if (likely(s_enr == e_enr)) {
|
||||||
inc_ap_bio(mdev, 1);
|
do {
|
||||||
drbd_make_request_common(mdev, bio, start_time);
|
inc_ap_bio(mdev, 1);
|
||||||
|
} while (drbd_make_request_common(mdev, bio, start_time));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue