[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/29] qed: Remove ret argument from qed_aio_next_io
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 23/29] qed: Remove ret argument from qed_aio_next_io() |
Date: |
Fri, 26 May 2017 22:22:04 +0200 |
All callers pass ret = 0, so we can just remove it.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qed.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 3a26fdf..078591b 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -253,11 +253,11 @@ static CachedL2Table *qed_new_l2_table(BDRVQEDState *s)
return l2_table;
}
-static void qed_aio_next_io(QEDAIOCB *acb, int ret);
+static void qed_aio_next_io(QEDAIOCB *acb);
static void qed_aio_start_io(QEDAIOCB *acb)
{
- qed_aio_next_io(acb, 0);
+ qed_aio_next_io(acb);
}
static void qed_plug_allocating_write_reqs(BDRVQEDState *s)
@@ -1277,13 +1277,14 @@ static int qed_aio_read_data(void *opaque, int ret,
uint64_t offset, size_t len)
/**
* Begin next I/O or complete the request
*/
-static void qed_aio_next_io(QEDAIOCB *acb, int ret)
+static void qed_aio_next_io(QEDAIOCB *acb)
{
BDRVQEDState *s = acb_to_s(acb);
uint64_t offset;
size_t len;
+ int ret;
- trace_qed_aio_next_io(s, acb, ret, acb->cur_pos + acb->cur_qiov.size);
+ trace_qed_aio_next_io(s, acb, 0, acb->cur_pos + acb->cur_qiov.size);
if (acb->backing_qiov) {
qemu_iovec_destroy(acb->backing_qiov);
@@ -1291,12 +1292,6 @@ static void qed_aio_next_io(QEDAIOCB *acb, int ret)
acb->backing_qiov = NULL;
}
- /* Handle I/O error */
- if (ret) {
- qed_aio_complete(acb, ret);
- return;
- }
-
acb->qiov_offset += acb->cur_qiov.size;
acb->cur_pos += acb->cur_qiov.size;
qemu_iovec_reset(&acb->cur_qiov);
@@ -1327,7 +1322,7 @@ static void qed_aio_next_io(QEDAIOCB *acb, int ret)
}
return;
}
- qed_aio_next_io(acb, 0);
+ qed_aio_next_io(acb);
}
static BlockAIOCB *qed_aio_setup(BlockDriverState *bs,
--
1.8.3.1
- [Qemu-devel] [PATCH 17/29] qed: Add return value to qed_aio_write_l1_update(), (continued)
- [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, 2017/05/26
- [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 <=
- [Qemu-devel] [PATCH 22/29] qed: Add return value to qed_aio_read/write_data(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 24/29] qed: Remove recursion in qed_aio_next_io(), Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 26/29] qed: Use CoQueue for serialising allocations, Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 25/29] qed: Implement .bdrv_co_readv/writev, Kevin Wolf, 2017/05/26
- [Qemu-devel] [PATCH 27/29] qed: Simplify request handling, Kevin Wolf, 2017/05/26