blk-mq: allow blk_mq_init_commands() to return failure

[deliverable/linux.git] / drivers / block / virtio_blk.c

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index b1cb3f4c4db45543c653fd86ce28e75b67522430..0eace43cea113159d9e94fc75e1710049d0e0c00 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -490,13 +490,14 @@ static struct blk_mq_reg virtio_mq_reg = {
        .flags          = BLK_MQ_F_SHOULD_MERGE,
 };
 
-static void virtblk_init_vbr(void *data, struct blk_mq_hw_ctx *hctx,
+static int virtblk_init_vbr(void *data, struct blk_mq_hw_ctx *hctx,
                             struct request *rq, unsigned int nr)
 {
        struct virtio_blk *vblk = data;
        struct virtblk_req *vbr = rq->special;
 
        sg_init_table(vbr->sg, vblk->sg_elems);
+       return 0;
 }
 
 static int virtblk_probe(struct virtio_device *vdev)