From e4972ea3ffe8106c85c54118d089b1dd5b8a0e92 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Tue, 20 Dec 2011 11:49:58 +0100 Subject: [PATCH] --- yaml --- r: 346156 b: refs/heads/master c: 69b6a3b159927d45092f64e07f40d5ecf93e11d8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_req.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c459bcf792dd..7fa6ea3d88c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7da358625c056b631b0abf2fcf50dad5bcbc22d9 +refs/heads/master: 69b6a3b159927d45092f64e07f40d5ecf93e11d8 diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index cf3c10e23c50..e9a2f238b897 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/drivers/block/drbd/drbd_req.c @@ -929,8 +929,8 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s } if (drbd_suspended(mdev)) { - /* If we got suspended, use the retry mechanism of - generic_make_request() to restart processing of this + /* If we got suspended, use the retry mechanism in + 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; @@ -1110,8 +1110,11 @@ int drbd_make_request(struct request_queue *q, struct bio *bio) D_ASSERT(bio->bi_size > 0); D_ASSERT(IS_ALIGNED(bio->bi_size, 512)); - inc_ap_bio(mdev); - return __drbd_make_request(mdev, bio, start_time); + do { + inc_ap_bio(mdev); + } while (__drbd_make_request(mdev, bio, start_time)); + + return 0; } /* This is called by bio_add_page().