From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFCPe-0002Gh-AK for qemu-devel@nongnu.org; Tue, 14 Jul 2015 22:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFCPd-00019M-Hq for qemu-devel@nongnu.org; Tue, 14 Jul 2015 22:27:10 -0400 From: Jeff Cody Date: Tue, 14 Jul 2015 22:26:55 -0400 Message-Id: <1436927217-383-4-git-send-email-jcody@redhat.com> In-Reply-To: <1436927217-383-1-git-send-email-jcody@redhat.com> References: <1436927217-383-1-git-send-email-jcody@redhat.com> Subject: [Qemu-devel] [PULL for-2.4 3/5] block: keep bitmap if incremental backup job is cancelled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: jcody@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi 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 Signed-off-by: Stefan Hajnoczi Message-id: 1434380534-7680-1-git-send-email-stefanha@redhat.com Signed-off-by: Jeff Cody --- 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