|
 |
357786 |
From ec75d6bf020a399a3caee05dcc37b463d438c332 Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Date: Mon, 10 Sep 2018 18:17:52 +0200
|
|
|
357786 |
Subject: [PATCH 14/25] block/mirror: don't install backing chain on abort
|
|
|
357786 |
|
|
|
357786 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Message-id: <20180910181803.11781-15-jsnow@redhat.com>
|
|
|
357786 |
Patchwork-id: 82091
|
|
|
357786 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 14/25] block/mirror: don't install backing chain on abort
|
|
|
357786 |
Bugzilla: 1626061
|
|
|
357786 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
357786 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
In cases where we abort the block/mirror job, there's no point in
|
|
|
357786 |
installing the new backing chain before we finish aborting.
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Message-id: 20180906130225.5118-6-jsnow@redhat.com
|
|
|
357786 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
357786 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
(cherry picked from commit 46e2f0070a9bd82187c12b679ec5a69c6aabe128)
|
|
|
357786 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
block/mirror.c | 2 +-
|
|
|
357786 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/block/mirror.c b/block/mirror.c
|
|
|
357786 |
index a80c359..1945000 100644
|
|
|
357786 |
--- a/block/mirror.c
|
|
|
357786 |
+++ b/block/mirror.c
|
|
|
357786 |
@@ -514,7 +514,7 @@ static void mirror_exit(Job *job)
|
|
|
357786 |
* required before it could become a backing file of target_bs. */
|
|
|
357786 |
bdrv_child_try_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL,
|
|
|
357786 |
&error_abort);
|
|
|
357786 |
- if (s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
|
|
|
357786 |
+ if (ret == 0 && s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
|
|
|
357786 |
BlockDriverState *backing = s->is_none_mode ? src : s->base;
|
|
|
357786 |
if (backing_bs(target_bs) != backing) {
|
|
|
357786 |
bdrv_set_backing_hd(target_bs, backing, &local_err);
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|