diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-03-02 17:48:14 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-03-07 14:53:28 +0100 |
| commit | 7d9fcb391c7898fb1417d84eba41d3d48bd76605 (patch) | |
| tree | 10ce9f7b702711f18a1ac80549144ba097bd90c7 /block | |
| parent | b247767aacdc2cfba94050c901aec268be94cc2d (diff) | |
mirror: Fix permission problem with 'replaces'
The 'replaces' option of drive-mirror can be used to mirror a Quorum
node to a new image and then let the target image replace one of the
Quorum children. In order for this graph modification to succeed, the
mirror job needs to lift its restrictions on the target node first
before actually replacing the child.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/mirror.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/block/mirror.c b/block/mirror.c index 57f26c33a4..c9185b38a8 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -509,6 +509,13 @@ static void mirror_exit(BlockJob *job, void *opaque) * block_job_completed(). */ bdrv_ref(src); bdrv_ref(mirror_top_bs); + bdrv_ref(target_bs); + + /* Remove target parent that still uses BLK_PERM_WRITE/RESIZE before + * inserting target_bs at s->to_replace, where we might not be able to get + * these permissions. */ + blk_unref(s->target); + s->target = NULL; /* We don't access the source any more. Dropping any WRITE/RESIZE is * required before it could become a backing file of target_bs. */ @@ -555,8 +562,7 @@ static void mirror_exit(BlockJob *job, void *opaque) aio_context_release(replace_aio_context); } g_free(s->replaces); - blk_unref(s->target); - s->target = NULL; + bdrv_unref(target_bs); /* Remove the mirror filter driver from the graph. Before this, get rid of * the blockers on the intermediate nodes so that the resulting state is |