[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 08/14] blockjob: Simplify block_job_finish_sy
From: |
John Snow |
Subject: |
Re: [Qemu-devel] [PATCH v6 08/14] blockjob: Simplify block_job_finish_sync |
Date: |
Mon, 21 Sep 2015 18:50:52 -0400 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 |
On 09/15/2015 02:11 AM, Fam Zheng wrote:
> With job->completed and job->ret to replace BlockFinishData.
>
> Signed-off-by: Fam Zheng <address@hidden>
> Reviewed-by: Max Reitz <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
>
Reviewed-by: John Snow <address@hidden>
- [Qemu-devel] [PATCH v6 04/14] backup: Extract dirty bitmap handling as a separate function, (continued)
- [Qemu-devel] [PATCH v6 04/14] backup: Extract dirty bitmap handling as a separate function, Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 03/14] block: rename BlkTransactionState and BdrvActionOps, Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 05/14] blockjob: Introduce reference count, Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 06/14] blockjob: Add .commit and .abort block job actions, Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 07/14] blockjob: Add "completed" and "ret" in BlockJob, Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 08/14] blockjob: Simplify block_job_finish_sync, Fam Zheng, 2015/09/15
- Re: [Qemu-devel] [PATCH v6 08/14] blockjob: Simplify block_job_finish_sync,
John Snow <=
- [Qemu-devel] [PATCH v6 09/14] block: Add block job transactions, Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 10/14] blockdev: make BlockJobTxn available to qmp 'transaction', Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 11/14] block/backup: support block job transactions, Fam Zheng, 2015/09/15
- [Qemu-devel] [PATCH v6 12/14] iotests: 124 - transactional failure test, Fam Zheng, 2015/09/15