openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qed: Add return value to qed_aio_write_l1_update() 

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 fae25ac7bd
commit fb18de21e0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/qed.c
View File

@ -958,18 +958,12 @@ static void qed_aio_complete(QEDAIOCB *acb, int ret)
/** /**
* Update L1 table with new L2 table offset and write it out * Update L1 table with new L2 table offset and write it out
*/ */
static void qed_aio_write_l1_update(void *opaque, int ret) static int qed_aio_write_l1_update(QEDAIOCB *acb)
{ {
QEDAIOCB *acb = opaque;
BDRVQEDState *s = acb_to_s(acb); BDRVQEDState *s = acb_to_s(acb);
CachedL2Table *l2_table = acb->request.l2_table; CachedL2Table *l2_table = acb->request.l2_table;
uint64_t l2_offset = l2_table->offset; uint64_t l2_offset = l2_table->offset;
int index; int index, ret;
if (ret) {
qed_aio_complete(acb, ret);
return;
}
index = qed_l1_index(s, acb->cur_pos); index = qed_l1_index(s, acb->cur_pos);
s->l1_table->offsets[index] = l2_table->offset; s->l1_table->offsets[index] = l2_table->offset;
@ -985,7 +979,7 @@ static void qed_aio_write_l1_update(void *opaque, int ret)
acb->request.l2_table = qed_find_l2_cache_entry(&s->l2_cache, l2_offset); acb->request.l2_table = qed_find_l2_cache_entry(&s->l2_cache, l2_offset);
assert(acb->request.l2_table != NULL); assert(acb->request.l2_table != NULL);
qed_aio_next_io(acb, ret); return ret;
} }
@ -1014,7 +1008,12 @@ static void qed_aio_write_l2_update(QEDAIOCB *acb, int ret, uint64_t offset)
if (need_alloc) { if (need_alloc) {
/* Write out the whole new L2 table */ /* Write out the whole new L2 table */
ret = qed_write_l2_table(s, &acb->request, 0, s->table_nelems, true); ret = qed_write_l2_table(s, &acb->request, 0, s->table_nelems, true);
qed_aio_write_l1_update(acb, ret); if (ret) {
goto err;
}
ret = qed_aio_write_l1_update(acb);
qed_aio_next_io(acb, ret);
} else { } else {
/* Write out only the updated part of the L2 table */ /* Write out only the updated part of the L2 table */
ret = qed_write_l2_table(s, &acb->request, index, acb->cur_nclusters, ret = qed_write_l2_table(s, &acb->request, index, acb->cur_nclusters,