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

qed: Add return value to qed_aio_write_l2_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 fb18de21e0
commit 88d2dd72bc
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
block/qed.c
View File

@ -986,15 +986,11 @@ static int qed_aio_write_l1_update(QEDAIOCB *acb)
/** /**
* Update L2 table with new cluster offsets and write them out * Update L2 table with new cluster offsets and write them out
*/ */
static void qed_aio_write_l2_update(QEDAIOCB *acb, int ret, uint64_t offset) static int qed_aio_write_l2_update(QEDAIOCB *acb, uint64_t offset)
{ {
BDRVQEDState *s = acb_to_s(acb); BDRVQEDState *s = acb_to_s(acb);
bool need_alloc = acb->find_cluster_ret == QED_CLUSTER_L1; bool need_alloc = acb->find_cluster_ret == QED_CLUSTER_L1;
int index; int index, ret;
if (ret) {
goto err;
}
if (need_alloc) { if (need_alloc) {
qed_unref_l2_cache_entry(acb->request.l2_table); qed_unref_l2_cache_entry(acb->request.l2_table);
@ -1009,21 +1005,18 @@ static void qed_aio_write_l2_update(QEDAIOCB *acb, int ret, uint64_t offset)
/* 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);
if (ret) { if (ret) {
goto err; return ret;
} }
ret = qed_aio_write_l1_update(acb); return 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,
false); false);
qed_aio_next_io(acb, ret); if (ret) {
return ret;
}
} }
return; return 0;
err:
qed_aio_complete(acb, ret);
} }
/** /**
@ -1065,8 +1058,19 @@ static void qed_aio_write_main(void *opaque, int ret)
*/ */
ret = bdrv_flush(s->bs->file->bs); ret = bdrv_flush(s->bs->file->bs);
} }
qed_aio_write_l2_update(acb, ret, acb->cur_cluster); if (ret) {
goto err;
}
ret = qed_aio_write_l2_update(acb, acb->cur_cluster);
if (ret) {
goto err;
}
qed_aio_next_io(acb, 0);
} }
return;
err:
qed_aio_complete(acb, ret);
} }
/** /**
@ -1124,7 +1128,12 @@ static void qed_aio_write_zero_cluster(void *opaque, int ret)
return; return;
} }
qed_aio_write_l2_update(acb, 0, 1); ret = qed_aio_write_l2_update(acb, 1);
if (ret < 0) {
qed_aio_complete(acb, ret);
return;
}
qed_aio_next_io(acb, 0);
} }
/** /**