virtio-blk: convert to batch completion

Signed-off-by: Kent Overstreet <koverstreet@google.com>
Cc: Zach Brown <zab@redhat.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: Selvan Mani <smani@micron.com>
Cc: Sam Bradshaw <sbradshaw@micron.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 8ad21a25bc0d92cc80f48f69f4556bdcc6ef6fa2..5a9e04a6a6d7f194c68fa90f06bcb500d1be9feb 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -210,7 +210,8 @@ static void virtblk_bio_send_flush_work(struct work_struct *work)
        virtblk_bio_send_flush(vbr);
 }
 
-static inline void virtblk_request_done(struct virtblk_req *vbr)
+static inline void virtblk_request_done(struct virtblk_req *vbr,
+                                       struct batch_complete *batch)
 {
        struct virtio_blk *vblk = vbr->vblk;
        struct request *req = vbr->req;
@@ -224,11 +225,12 @@ static inline void virtblk_request_done(struct virtblk_req *vbr)
                req->errors = (error != 0);
        }
 
-       __blk_end_request_all(req, error);
+       blk_end_request_all_batch(req, error, batch);
        mempool_free(vbr, vblk->pool);
 }
 
-static inline void virtblk_bio_flush_done(struct virtblk_req *vbr)
+static inline void virtblk_bio_flush_done(struct virtblk_req *vbr,
+                                         struct batch_complete *batch)
 {
        struct virtio_blk *vblk = vbr->vblk;
 
@@ -237,12 +239,13 @@ static inline void virtblk_bio_flush_done(struct virtblk_req *vbr)
                INIT_WORK(&vbr->work, virtblk_bio_send_data_work);
                queue_work(virtblk_wq, &vbr->work);
        } else {
-               bio_endio(vbr->bio, virtblk_result(vbr));
+               bio_endio_batch(vbr->bio, virtblk_result(vbr), batch);
                mempool_free(vbr, vblk->pool);
        }
 }
 
-static inline void virtblk_bio_data_done(struct virtblk_req *vbr)
+static inline void virtblk_bio_data_done(struct virtblk_req *vbr,
+                                        struct batch_complete *batch)
 {
        struct virtio_blk *vblk = vbr->vblk;
 
@@ -252,17 +255,18 @@ static inline void virtblk_bio_data_done(struct virtblk_req *vbr)
                INIT_WORK(&vbr->work, virtblk_bio_send_flush_work);
                queue_work(virtblk_wq, &vbr->work);
        } else {
-               bio_endio(vbr->bio, virtblk_result(vbr));
+               bio_endio_batch(vbr->bio, virtblk_result(vbr), batch);
                mempool_free(vbr, vblk->pool);
        }
 }
 
-static inline void virtblk_bio_done(struct virtblk_req *vbr)
+static inline void virtblk_bio_done(struct virtblk_req *vbr,
+                                   struct batch_complete *batch)
 {
        if (unlikely(vbr->flags & VBLK_IS_FLUSH))
-               virtblk_bio_flush_done(vbr);
+               virtblk_bio_flush_done(vbr, batch);
        else
-               virtblk_bio_data_done(vbr);
+               virtblk_bio_data_done(vbr, batch);
 }
 
 static void virtblk_done(struct virtqueue *vq)
@@ -272,16 +276,19 @@ static void virtblk_done(struct virtqueue *vq)
        struct virtblk_req *vbr;
        unsigned long flags;
        unsigned int len;
+       struct batch_complete batch;
+
+       batch_complete_init(&batch);
 
        spin_lock_irqsave(vblk->disk->queue->queue_lock, flags);
        do {
                virtqueue_disable_cb(vq);
                while ((vbr = virtqueue_get_buf(vblk->vq, &len)) != NULL) {
                        if (vbr->bio) {
-                               virtblk_bio_done(vbr);
+                               virtblk_bio_done(vbr, &batch);
                                bio_done = true;
                        } else {
-                               virtblk_request_done(vbr);
+                               virtblk_request_done(vbr, &batch);
                                req_done = true;
                        }
                }
@@ -291,6 +298,8 @@ static void virtblk_done(struct virtqueue *vq)
                blk_start_queue(vblk->disk->queue);
        spin_unlock_irqrestore(vblk->disk->queue->queue_lock, flags);
 
+       batch_complete(&batch);
+
        if (bio_done)
                wake_up(&vblk->queue_wait);
 }