[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/29] qed: Add return value to qed_aio_write_l2_upd
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 18/29] qed: Add return value to qed_aio_write_l2_update() |
Date: |
Fri, 26 May 2017 22:21:59 +0200 |
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 <address@hidden>
---
block/qed.c | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 2034b58..259abb2 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -986,15 +986,11 @@ static int qed_aio_write_l1_update(QEDAIOCB *acb)
/**
* 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);
bool need_alloc = acb->find_cluster_ret == QED_CLUSTER_L1;
- int index;
-
- if (ret) {
- goto err;
- }
+ int index, ret;
if (need_alloc) {
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 */
ret = qed_write_l2_table(s, &acb->request, 0, s->table_nelems, true);
if (ret) {
- goto err;
+ return ret;
}
- ret = qed_aio_write_l1_update(acb);
- qed_aio_next_io(acb, ret);
-
+ return qed_aio_write_l1_update(acb);
} else {
/* Write out only the updated part of the L2 table */
ret = qed_write_l2_table(s, &acb->request, index, acb->cur_nclusters,
false);
- qed_aio_next_io(acb, ret);
+ if (ret) {
+ return ret;
+ }
}
- return;
-
-err:
- qed_aio_complete(acb, ret);
+ return 0;
}
/**
@@ -1065,8 +1058,19 @@ static void qed_aio_write_main(void *opaque, int ret)
*/
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;
}
- 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);
}
/**
--
1.8.3.1
- [Qemu-devel] [PATCH 14/29] qed: Make qed_aio_read_data() synchronous, (continued)
- [Qemu-devel] [PATCH 14/29] qed: Make qed_aio_read_data() synchronous, Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 13/29] qed: Remove callback from qed_write_table(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 15/29] qed: Make qed_aio_write_main() synchronous, Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 16/29] qed: Inline qed_commit_l2_update(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 17/29] qed: Add return value to qed_aio_write_l1_update(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 18/29] qed: Add return value to qed_aio_write_l2_update(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 19/29] qed: Add return value to qed_aio_write_main(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 20/29] qed: Add return value to qed_aio_write_cow(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 21/29] qed: Add return value to qed_aio_write_inplace/alloc(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 23/29] qed: Remove ret argument from qed_aio_next_io(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 22/29] qed: Add return value to qed_aio_read/write_data(), Kevin Wolf, 2017/05/26