2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 37dad18ba153..c706d50a8b06 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1132,9 +1132,9 @@ void drbd_reconsider_max_bio_size(struct drbd_conf *mdev)
         /* We may ignore peer limits if the peer is modern enough.
            Because new from 8.3.8 onwards the peer can use multiple
            BIOs for a single peer_request */
-        if (mdev->state.conn >= C_CONNECTED) {
+        if (mdev->state.conn >= C_WF_REPORT_PARAMS) {
                 if (mdev->tconn->agreed_pro_version < 94)
-                        peer = min( mdev->peer_max_bio_size, DRBD_MAX_SIZE_H80_PACKET);
+                        peer = min(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;
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index c24379ffd4e3..fec7bef44994 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1306,6 +1306,7 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
         int backing_limit;
 
         if (bio_size && get_ldev(mdev)) {
+                unsigned int max_hw_sectors = queue_max_hw_sectors(q);
                 struct request_queue * const b =
                         mdev->ldev->backing_bdev->bd_disk->queue;
                 if (b->merge_bvec_fn) {
@@ -1313,6 +1314,8 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
                         limit = min(limit, backing_limit);
                 }
                 put_ldev(mdev);
+                if ((limit >> 9) > max_hw_sectors)
+                        limit = max_hw_sectors << 9;
         }
         return limit;
 }