[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/14] blockjob: Simplify block_job_finish_sync
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 08/14] blockjob: Simplify block_job_finish_sync |
Date: |
Thu, 30 Jul 2015 14:39:24 +0800 |
With job->completed and job->ret to replace BlockFinishData.
Signed-off-by: Fam Zheng <address@hidden>
---
blockjob.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 293b62a..36c18e0 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -185,43 +185,28 @@ struct BlockFinishData {
int ret;
};
-static void block_job_finish_cb(void *opaque, int ret)
-{
- struct BlockFinishData *data = opaque;
-
- data->cancelled = block_job_is_cancelled(data->job);
- data->ret = ret;
- data->cb(data->opaque, ret);
-}
-
static int block_job_finish_sync(BlockJob *job,
void (*finish)(BlockJob *, Error **errp),
Error **errp)
{
- struct BlockFinishData data;
BlockDriverState *bs = job->bs;
Error *local_err = NULL;
+ int ret;
assert(bs->job == job);
- /* Set up our own callback to store the result and chain to
- * the original callback.
- */
- data.job = job;
- data.cb = job->cb;
- data.opaque = job->opaque;
- data.ret = -EINPROGRESS;
- job->cb = block_job_finish_cb;
- job->opaque = &data;
+ block_job_ref(job);
finish(job, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return -EBUSY;
}
- while (data.ret == -EINPROGRESS) {
+ while (!job->completed) {
aio_poll(bdrv_get_aio_context(bs), true);
}
- return (data.cancelled && data.ret == 0) ? -ECANCELED : data.ret;
+ ret = (job->cancelled && job->ret == 0) ? -ECANCELED : job->ret;
+ block_job_unref(job);
+ return ret;
}
/* A wrapper around block_job_cancel() taking an Error ** parameter so it may
be
--
2.4.3
- [Qemu-devel] [PATCH v4 00/14] block: incremental backup transactions using BlockJobTxn, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 01/14] qapi: Add transaction support to block-dirty-bitmap operations, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 02/14] iotests: add transactional incremental backup test, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 03/14] block: rename BlkTransactionState and BdrvActionOps, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 04/14] backup: Extract dirty bitmap handling as a separate function, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 06/14] blockjob: Add .commit and .abort block job actions, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 05/14] blockjob: Introduce reference count, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 07/14] blockjob: Add "completed" and "ret" in BlockJob, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 08/14] blockjob: Simplify block_job_finish_sync,
Fam Zheng <=
- [Qemu-devel] [PATCH v4 09/14] block: add block job transactions, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 10/14] blockdev: make BlockJobTxn available to qmp 'transaction', Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 11/14] block/backup: support block job transactions, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 12/14] iotests: 124 - transactional failure test, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 13/14] qmp-commands.hx: Update the supported 'transaction' operations, Fam Zheng, 2015/07/30
- [Qemu-devel] [PATCH v4 14/14] tests: add BlockJobTxn unit test, Fam Zheng, 2015/07/30