OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qed: Add return value to qed_aio_write_main() 

Don't recurse into qed_aio_next_io() and qed_aio_complete() here, but
just return an error code and let the caller handle it.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2016-11-17 15:40:41 +01:00
parent 88d2dd72bc
commit eaf0bc56f5
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
block/qed.c
View File

@ -1022,29 +1022,22 @@ static int qed_aio_write_l2_update(QEDAIOCB *acb, uint64_t offset)
/**
* Write data to the image file
*/
static void qed_aio_write_main(void *opaque, int ret)
static int qed_aio_write_main(QEDAIOCB *acb)
{
QEDAIOCB *acb = opaque;
BDRVQEDState *s = acb_to_s(acb);
uint64_t offset = acb->cur_cluster +
qed_offset_into_cluster(s, acb->cur_pos);
int ret;
trace_qed_aio_write_main(s, acb, ret, offset, acb->cur_qiov.size);
if (ret) {
qed_aio_complete(acb, ret);
return;
}
trace_qed_aio_write_main(s, acb, 0, offset, acb->cur_qiov.size);
BLKDBG_EVENT(s->bs->file, BLKDBG_WRITE_AIO);
ret = bdrv_pwritev(s->bs->file, offset, &acb->cur_qiov);
if (ret >= 0) {
ret = 0;
if (ret < 0) {
return ret;
}
if (acb->find_cluster_ret == QED_CLUSTER_FOUND) {
qed_aio_next_io(acb, ret);
} else {
if (acb->find_cluster_ret != QED_CLUSTER_FOUND) {
if (s->bs->backing) {
/*
* Flush new data clusters before updating the L2 table
@ -1057,20 +1050,16 @@ static void qed_aio_write_main(void *opaque, int ret)
* cluster and before updating the L2 table.
*/
ret = bdrv_flush(s->bs->file->bs);
}
if (ret) {
goto err;
if (ret < 0) {
return ret;
}
}
ret = qed_aio_write_l2_update(acb, acb->cur_cluster);
if (ret) {
goto err;
if (ret < 0) {
return ret;
}
qed_aio_next_io(acb, 0);
}
return;
err:
qed_aio_complete(acb, ret);
return 0;
}
/**
@ -1102,8 +1091,17 @@ static void qed_aio_write_cow(void *opaque, int ret)
trace_qed_aio_write_postfill(s, acb, start, len, offset);
ret = qed_copy_from_backing_file(s, start, len, offset);
if (ret) {
qed_aio_complete(acb, ret);
return;
}
qed_aio_write_main(acb, ret);
ret = qed_aio_write_main(acb);
if (ret < 0) {
qed_aio_complete(acb, ret);
return;
}
qed_aio_next_io(acb, 0);
}
/**
@ -1201,6 +1199,8 @@ static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len)
*/
static void qed_aio_write_inplace(QEDAIOCB *acb, uint64_t offset, size_t len)
{
int ret;
/* Allocate buffer for zero writes */
if (acb->flags & QED_AIOCB_ZERO) {
struct iovec *iov = acb->qiov->iov;
@ -1220,7 +1220,12 @@ static void qed_aio_write_inplace(QEDAIOCB *acb, uint64_t offset, size_t len)
qemu_iovec_concat(&acb->cur_qiov, acb->qiov, acb->qiov_offset, len);
/* Do the actual write */
qed_aio_write_main(acb, 0);
ret = qed_aio_write_main(acb);
if (ret < 0) {
qed_aio_complete(acb, ret);
return;
}
qed_aio_next_io(acb, 0);
}
/**