mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
rbd: check return values when scheduling aio
If scheduling fails, the number of outstanding I/Os must be correct, or there will be a hang when waiting for everything to be flushed. Reviewed-by: Christian Brunner <chb@muc.de> Reported-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
fab5cf592c
commit
51a135287a
24
block/rbd.c
24
block/rbd.c
|
@ -581,10 +581,14 @@ static BlockDriverAIOCB *rbd_aio_rw_vector(BlockDriverState *bs,
|
||||||
rbd_completion_t c;
|
rbd_completion_t c;
|
||||||
int64_t off, size;
|
int64_t off, size;
|
||||||
char *buf;
|
char *buf;
|
||||||
|
int r;
|
||||||
|
|
||||||
BDRVRBDState *s = bs->opaque;
|
BDRVRBDState *s = bs->opaque;
|
||||||
|
|
||||||
acb = qemu_aio_get(&rbd_aio_pool, bs, cb, opaque);
|
acb = qemu_aio_get(&rbd_aio_pool, bs, cb, opaque);
|
||||||
|
if (!acb) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
acb->write = write;
|
acb->write = write;
|
||||||
acb->qiov = qiov;
|
acb->qiov = qiov;
|
||||||
acb->bounce = qemu_blockalign(bs, qiov->size);
|
acb->bounce = qemu_blockalign(bs, qiov->size);
|
||||||
|
@ -611,16 +615,28 @@ static BlockDriverAIOCB *rbd_aio_rw_vector(BlockDriverState *bs,
|
||||||
rcb->buf = buf;
|
rcb->buf = buf;
|
||||||
rcb->s = acb->s;
|
rcb->s = acb->s;
|
||||||
rcb->size = size;
|
rcb->size = size;
|
||||||
|
r = rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c);
|
||||||
|
if (r < 0) {
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
|
||||||
if (write) {
|
if (write) {
|
||||||
rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c);
|
r = rbd_aio_write(s->image, off, size, buf, c);
|
||||||
rbd_aio_write(s->image, off, size, buf, c);
|
|
||||||
} else {
|
} else {
|
||||||
rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb, &c);
|
r = rbd_aio_read(s->image, off, size, buf, c);
|
||||||
rbd_aio_read(s->image, off, size, buf, c);
|
}
|
||||||
|
|
||||||
|
if (r < 0) {
|
||||||
|
goto failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
return &acb->common;
|
return &acb->common;
|
||||||
|
|
||||||
|
failed:
|
||||||
|
qemu_free(rcb);
|
||||||
|
s->qemu_aio_count--;
|
||||||
|
qemu_aio_release(acb);
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static BlockDriverAIOCB *qemu_rbd_aio_readv(BlockDriverState *bs,
|
static BlockDriverAIOCB *qemu_rbd_aio_readv(BlockDriverState *bs,
|
||||||
|
|
Loading…
Reference in a new issue