Commit 17d9716d authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Jeff Cody
Browse files

block: keep bitmap if incremental backup job is cancelled 



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: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1434380534-7680-1-git-send-email-stefanha@redhat.com
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 299bf097

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -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);