From: Philipp Reisner Date: Wed, 25 May 2011 09:14:35 +0000 (+0200) Subject: drbd: Use the correct max_bio_size when creating resync requests X-Git-Tag: v3.0-rc7~36^2^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cfdd247d1779d5ffc8f685b172a526ecdc6773f;p=platform%2Fkernel%2Flinux-stable.git drbd: Use the correct max_bio_size when creating resync requests Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 4d76b06..4d3e6f6 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -536,12 +536,7 @@ static int w_make_resync_request(struct drbd_conf *mdev, return 1; } - /* starting with drbd 8.3.8, we can handle multi-bio EEs, - * if it should be necessary */ - max_bio_size = - mdev->agreed_pro_version < 94 ? queue_max_hw_sectors(mdev->rq_queue) << 9 : - mdev->agreed_pro_version < 95 ? DRBD_MAX_SIZE_H80_PACKET : DRBD_MAX_BIO_SIZE; - + max_bio_size = queue_max_hw_sectors(mdev->rq_queue) << 9; number = drbd_rs_number_requests(mdev); if (number == 0) goto requeue;