[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/15] block/mirror: don't install backing chain
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v3 05/15] block/mirror: don't install backing chain on abort |
Date: |
Fri, 31 Aug 2018 18:28:57 -0400 |
In cases where we abort the block/mirror job, there's no point in
installing the new backing chain before we finish aborting.
Move this to the "success" portion of mirror_exit.
Signed-off-by: John Snow <address@hidden>
---
block/mirror.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index cba555b4ef..c164fee883 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -642,16 +642,6 @@ static void mirror_exit(Job *job)
* required before it could become a backing file of target_bs. */
bdrv_child_try_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL,
&error_abort);
- if (s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
- BlockDriverState *backing = s->is_none_mode ? src : s->base;
- if (backing_bs(target_bs) != backing) {
- bdrv_set_backing_hd(target_bs, backing, &local_err);
- if (local_err) {
- error_report_err(local_err);
- ret = -EPERM;
- }
- }
- }
if (s->to_replace) {
replace_aio_context = bdrv_get_aio_context(s->to_replace);
@@ -659,9 +649,18 @@ static void mirror_exit(Job *job)
}
if (s->should_complete && ret == 0) {
- BlockDriverState *to_replace = src;
- if (s->to_replace) {
- to_replace = s->to_replace;
+ BlockDriverState *to_replace = s->to_replace ? s->to_replace : src;
+
+ if (s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
+ BlockDriverState *backing = s->is_none_mode ? src : s->base;
+ if (backing_bs(target_bs) != backing) {
+ bdrv_set_backing_hd(target_bs, backing, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ ret = -EPERM;
+ goto clean;
+ }
+ }
}
if (bdrv_get_flags(target_bs) != bdrv_get_flags(to_replace)) {
@@ -678,6 +677,8 @@ static void mirror_exit(Job *job)
ret = -EPERM;
}
}
+
+ clean:
if (s->to_replace) {
bdrv_op_unblock_all(s->to_replace, s->replace_blocker);
error_free(s->replace_blocker);
--
2.14.4
- [Qemu-devel] [PATCH v3 00/15] jobs: Job Exit Refactoring Pt 2, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 08/15] tests/blockjob: replace Blockjob with Job, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 11/15] jobs: remove .exit callback, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 13/15] qapi/block-mirror: expose new job properties, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 05/15] block/mirror: don't install backing chain on abort,
John Snow <=
- [Qemu-devel] [PATCH v3 14/15] qapi/block-stream: expose new job properties, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 09/15] tests/test-blockjob: remove exit callback, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 12/15] qapi/block-commit: expose new job properties, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 06/15] block/mirror: conservative mirror_exit refactor, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 15/15] block/backup: qapi documentation fixup, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 03/15] block/stream: add block job creation flags, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 04/15] block/commit: refactor commit to use job callbacks, John Snow, 2018/08/31
- [Qemu-devel] [PATCH v3 10/15] tests/test-blockjob-txn: move .exit to .clean, John Snow, 2018/08/31