[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v11 08/14] blockjob: Simplify block_job_finish_sync
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v11 08/14] blockjob: Simplify block_job_finish_sync |
Date: |
Thu, 5 Nov 2015 18:13:14 -0500 |
From: Fam Zheng <address@hidden>
With job->completed and job->ret to replace BlockFinishData.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
blockjob.c | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index bcd7efc..81b268e 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -188,43 +188,29 @@ 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);
+ block_job_unref(job);
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-block] [PATCH v11 04/14] backup: Extract dirty bitmap handling as a separate function, (continued)
- [Qemu-block] [PATCH v11 04/14] backup: Extract dirty bitmap handling as a separate function, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 03/14] block: rename BlkTransactionState and BdrvActionOps, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 02/14] iotests: add transactional incremental backup test, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 01/14] qapi: Add transaction support to block-dirty-bitmap operations, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 06/14] blockjob: Add .commit and .abort block job actions, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 05/14] blockjob: Introduce reference count and fix reference to job->bs, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 09/14] block: Add block job transactions, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 11/14] block: Add BlockJobTxn support to backup_run, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 12/14] block: add transactional properties, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 07/14] blockjob: Add "completed" and "ret" in BlockJob, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 08/14] blockjob: Simplify block_job_finish_sync,
John Snow <=
- [Qemu-block] [PATCH v11 10/14] block/backup: Rely on commit/abort for cleanup, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 14/14] tests: add BlockJobTxn unit test, John Snow, 2015/11/05
- [Qemu-block] [PATCH v11 13/14] iotests: 124 - transactional failure test, John Snow, 2015/11/05
- Re: [Qemu-block] [PATCH v11 00/14] block: incremental backup transactions using BlockJobTxn, Stefan Hajnoczi, 2015/11/10