diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-05-25 11:14:35 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-06-30 09:23:40 +0200 |
| commit | 0cfdd247d1779d5ffc8f685b172a526ecdc6773f (patch) | |
| tree | affca52cde37dde016424d5c17679464f855f7ae /drivers | |
| parent | a1c15c59feee36267c43142a41152fbf7402afb6 (diff) | |
| download | linux-stable-0cfdd247d1779d5ffc8f685b172a526ecdc6773f.tar.gz linux-stable-0cfdd247d1779d5ffc8f685b172a526ecdc6773f.tar.bz2 linux-stable-0cfdd247d1779d5ffc8f685b172a526ecdc6773f.zip | |
drbd: Use the correct max_bio_size when creating resync requests
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 4d76b06b6b20..4d3e6f6213ba 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; |