[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL for-2.4 3/5] block: keep bitmap if incremental backup
From: |
Jeff Cody |
Subject: |
[Qemu-block] [PULL for-2.4 3/5] block: keep bitmap if incremental backup job is cancelled |
Date: |
Tue, 14 Jul 2015 22:26:55 -0400 |
From: Stefan Hajnoczi <address@hidden>
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.
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <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);
--
1.9.3
- [Qemu-block] [PULL for-2.4 0/5] Block layer patches for 2.4.0-rc1, Jeff Cody, 2015/07/14
- [Qemu-block] [PULL for-2.4 1/5] block/mirror: Sleep periodically during bitmap scanning, Jeff Cody, 2015/07/14
- [Qemu-block] [PULL for-2.4 2/5] blockdev: no need to drain in qmp_block_commit, Jeff Cody, 2015/07/14
- [Qemu-block] [PULL for-2.4 3/5] block: keep bitmap if incremental backup job is cancelled,
Jeff Cody <=
- [Qemu-block] [PULL for-2.4 4/5] mirror: correct buf_size, Jeff Cody, 2015/07/14
- [Qemu-block] [PULL for-2.4 5/5] block/curl: Don't lose original error when a connection fails., Jeff Cody, 2015/07/14
- Re: [Qemu-block] [Qemu-devel] [PULL for-2.4 0/5] Block layer patches for 2.4.0-rc1, Peter Maydell, 2015/07/15