blk-mq: NVMe 512B/4K+T10 DIF/DIX format returns I/O error on dd with split op

[mirror_ubuntu-zesty-kernel.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3b57e75098c393b745bb8e4b1086159fb109ef7c..0c0eac8450928db92880c92789e6fcecaf93eee3 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1354,13 +1354,13 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
 
        blk_queue_bounce(q, &bio);
 
+       blk_queue_split(q, &bio, q->bio_split);
+
        if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
                bio_io_error(bio);
                return BLK_QC_T_NONE;
        }
 
-       blk_queue_split(q, &bio, q->bio_split);
-
        if (!is_flush_fua && !blk_queue_nomerges(q) &&
            blk_attempt_plug_merge(q, bio, &request_count, &same_queue_rq))
                return BLK_QC_T_NONE;