Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / drivers / md / dm-rq.c

diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index c6ebc5b1e00eb8be80e94ea2f31c190613fb4244..eadfcfd106ffffa4773421d5b61ae77414e36d6d 100644 (file)
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -117,9 +117,9 @@ static void end_clone_bio(struct bio *clone)
        struct dm_rq_clone_bio_info *info =
                container_of(clone, struct dm_rq_clone_bio_info, clone);
        struct dm_rq_target_io *tio = info->tio;
-       struct bio *bio = info->orig;
        unsigned int nr_bytes = info->orig->bi_iter.bi_size;
        blk_status_t error = clone->bi_status;
+       bool is_last = !clone->bi_next;
 
        bio_put(clone);
 
@@ -137,28 +137,23 @@ static void end_clone_bio(struct bio *clone)
                 * when the request is completed.
                 */
                tio->error = error;
-               return;
+               goto exit;
        }
 
        /*
         * I/O for the bio successfully completed.
         * Notice the data completion to the upper layer.
         */
-
-       /*
-        * bios are processed from the head of the list.
-        * So the completing bio should always be rq->bio.
-        * If it's not, something wrong is happening.
-        */
-       if (tio->orig->bio != bio)
-               DMERR("bio completion is going in the middle of the request");
+       tio->completed += nr_bytes;
 
        /*
         * Update the original request.
         * Do not use blk_end_request() here, because it may complete
         * the original request before the clone, and break the ordering.
         */
-       blk_update_request(tio->orig, BLK_STS_OK, nr_bytes);
+       if (is_last)
+ exit:
+               blk_update_request(tio->orig, BLK_STS_OK, tio->completed);
 }
 
 static struct dm_rq_target_io *tio_from_request(struct request *rq)
@@ -237,14 +232,14 @@ static void dm_end_request(struct request *clone, blk_status_t error)
 /*
  * Requeue the original request of a clone.
  */
-static void dm_old_requeue_request(struct request *rq)
+static void dm_old_requeue_request(struct request *rq, unsigned long delay_ms)
 {
        struct request_queue *q = rq->q;
        unsigned long flags;
 
        spin_lock_irqsave(q->queue_lock, flags);
        blk_requeue_request(q, rq);
-       blk_run_queue_async(q);
+       blk_delay_queue(q, delay_ms);
        spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
@@ -270,6 +265,7 @@ static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_
        struct mapped_device *md = tio->md;
        struct request *rq = tio->orig;
        int rw = rq_data_dir(rq);
+       unsigned long delay_ms = delay_requeue ? 100 : 0;
 
        rq_end_stats(md, rq);
        if (tio->clone) {
@@ -278,9 +274,9 @@ static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_
        }
 
        if (!rq->q->mq_ops)
-               dm_old_requeue_request(rq);
+               dm_old_requeue_request(rq, delay_ms);
        else
-               dm_mq_delay_requeue_request(rq, delay_requeue ? 100/*ms*/ : 0);
+               dm_mq_delay_requeue_request(rq, delay_ms);
 
        rq_completed(md, rw, false);
 }
@@ -455,6 +451,7 @@ static void init_tio(struct dm_rq_target_io *tio, struct request *rq,
        tio->clone = NULL;
        tio->orig = rq;
        tio->error = 0;
+       tio->completed = 0;
        /*
         * Avoid initializing info for blk-mq; it passes
         * target-specific data through info.ptr