diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-06-30 15:43:06 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:57:49 +0100 |
| commit | 2ffca4f3ee6c2d507c39689e5f569bcb0612d3ad (patch) | |
| tree | 93ad00a897ba69a66d4a8919b92927e81ff24136 /drivers/block/drbd/drbd_nl.c | |
| parent | d942ae44537669418a7cbfd916531d30513dbca8 (diff) | |
| download | kernel_goldelico_gta04-2ffca4f3ee6c2d507c39689e5f569bcb0612d3ad.zip kernel_goldelico_gta04-2ffca4f3ee6c2d507c39689e5f569bcb0612d3ad.tar.gz kernel_goldelico_gta04-2ffca4f3ee6c2d507c39689e5f569bcb0612d3ad.tar.bz2 | |
drbd: Improve compatibility with drbd's older than 8.3.7
Regression introduced with 8.3.11 commit:
drbd: Take a more conservative approach when deciding max_bio_size
Never ever tell an older drbd, that we support more than 32KiB
in a single data request (packet).
Never believe an older drbd, that is supports more than 32KiB
in a single data request (packet)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_nl.c')
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index f923462..838c3cd 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -1062,10 +1062,13 @@ void drbd_reconsider_max_bio_size(struct drbd_conf *mdev) BIOs for a single peer_request */ if (mdev->state.conn >= C_CONNECTED) { if (mdev->tconn->agreed_pro_version < 94) - peer = mdev->peer_max_bio_size; + peer = min_t(int, mdev->peer_max_bio_size, DRBD_MAX_SIZE_H80_PACKET); + /* Correct old drbd (up to 8.3.7) if it believes it can do more than 32KiB */ else if (mdev->tconn->agreed_pro_version == 94) peer = DRBD_MAX_SIZE_H80_PACKET; - else /* drbd 8.3.8 onwards */ + else if (mdev->tconn->agreed_pro_version < 100) + peer = DRBD_MAX_BIO_SIZE_P95; /* drbd 8.3.8 onwards, before 8.4.0 */ + else peer = DRBD_MAX_BIO_SIZE; } |