Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / block / loop.c

diff --git a/kernel/drivers/block/loop.c b/kernel/drivers/block/loop.c
index 423f4ca..ab0b2dd 100644 (file)
--- a/kernel/drivers/block/loop.c
+++ b/kernel/drivers/block/loop.c
@@ -488,6 +488,12 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
        bvec = __bvec_iter_bvec(bio->bi_io_vec, bio->bi_iter);
        iov_iter_bvec(&iter, ITER_BVEC | rw, bvec,
                      bio_segments(bio), blk_rq_bytes(cmd->rq));
+       /*
+        * This bio may be started from the middle of the 'bvec'
+        * because of bio splitting, so offset from the bvec must
+        * be passed to iov iterator
+        */
+       iter.iov_offset = bio->bi_iter.bi_bvec_done;
 
        cmd->iocb.ki_pos = pos;
        cmd->iocb.ki_filp = file;
@@ -1651,7 +1657,7 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
        blk_mq_start_request(bd->rq);
 
        if (lo->lo_state != Lo_bound)
-               return -EIO;
+               return BLK_MQ_RQ_QUEUE_ERROR;
 
        if (lo->use_dio && !(cmd->rq->cmd_flags & (REQ_FLUSH |
                                        REQ_DISCARD)))