[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 04/10] block: keep bitmap if incremental back
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH v2 04/10] block: keep bitmap if incremental backup job is cancelled |
Date: |
Tue, 7 Jul 2015 14:51:37 +0800 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Mon, 07/06 15:24, Stefan Hajnoczi wrote:
> Reclaim the dirty bitmap if an incremental backup block job is
> cancelled. The ret variable may be 0 when the job is cancelled so it's
> not enough to check ret < 0.
>
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
> block/backup.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/backup.c b/block/backup.c
> index d3c7d9f..965654d 100644
> --- a/block/backup.c
> +++ b/block/backup.c
> @@ -431,7 +431,7 @@ static void coroutine_fn backup_run(void *opaque)
>
> if (job->sync_bitmap) {
> BdrvDirtyBitmap *bm;
> - if (ret < 0) {
> + if (ret < 0 || block_job_is_cancelled(&job->common)) {
> /* Merge the successor back into the parent, delete nothing. */
> bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
> assert(bm);
> --
> 2.4.3
>
Reviewed-by: Fam Zheng <address@hidden>
- [Qemu-devel] [PATCH v2 00/10] block: incremental backup transactions using BlockJobTxn, Stefan Hajnoczi, 2015/07/06
- [Qemu-devel] [PATCH v2 02/10] iotests: add transactional incremental backup test, Stefan Hajnoczi, 2015/07/06
- [Qemu-devel] [PATCH v2 01/10] qapi: Add transaction support to block-dirty-bitmap operations, Stefan Hajnoczi, 2015/07/06
- [Qemu-devel] [PATCH v2 03/10] block: rename BlkTransactionState and BdrvActionOps, Stefan Hajnoczi, 2015/07/06
- [Qemu-devel] [PATCH v2 04/10] block: keep bitmap if incremental backup job is cancelled, Stefan Hajnoczi, 2015/07/06
- Re: [Qemu-devel] [PATCH v2 04/10] block: keep bitmap if incremental backup job is cancelled,
Fam Zheng <=
- [Qemu-devel] [PATCH v2 06/10] blockdev: make BlockJobTxn available to qmp 'transaction', Stefan Hajnoczi, 2015/07/06
- [Qemu-devel] [PATCH v2 07/10] block/backup: support block job transactions, Stefan Hajnoczi, 2015/07/06
- [Qemu-devel] [PATCH v2 05/10] block: add block job transactions, Stefan Hajnoczi, 2015/07/06
[Qemu-devel] [PATCH v2 08/10] iotests: 124 - transactional failure test, Stefan Hajnoczi, 2015/07/06
[Qemu-devel] [PATCH v2 09/10] qmp-commands.hx: Update the supported 'transaction' operations, Stefan Hajnoczi, 2015/07/06
[Qemu-devel] [PATCH v2 10/10] tests: add BlockJobTxn unit test, Stefan Hajnoczi, 2015/07/06