diff options
author | Fam Zheng <famz@redhat.com> | 2014-06-24 20:26:36 +0800 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2014-06-26 13:50:57 +0200 |
commit | 9e48b025400b2d284e17860862b0a4aa02c6032d (patch) | |
tree | 8d605e28a49b66e19ec51875fec0577ef555c54f /block/mirror.c | |
parent | dc71ce45ded4e872e25c2de32d5e7a71842b0985 (diff) |
mirror: Go through ready -> complete process for 0 len image
When mirroring or active committing a zero length image, BLOCK_JOB_READY
is not reported now, instead the job completes because we short circuit
the mirror job loop.
This is inconsistent with non-zero length images, and only confuses
management software.
Let's do the same thing when seeing a 0-length image: report ready
immediately; wait for block-job-cancel or block-job-complete; clear the
cancel flag as existing non-zero image synced case (cancelled after
ready); then jump to the exit.
Reported-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/mirror.c')
-rw-r--r-- | block/mirror.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/block/mirror.c b/block/mirror.c index 301a04de8e..7c9f898089 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -324,9 +324,18 @@ static void coroutine_fn mirror_run(void *opaque) } s->common.len = bdrv_getlength(bs); - if (s->common.len <= 0) { + if (s->common.len < 0) { ret = s->common.len; goto immediate_exit; + } else if (s->common.len == 0) { + /* Report BLOCK_JOB_READY and wait for complete. */ + block_job_event_ready(&s->common); + s->synced = true; + while (!block_job_is_cancelled(&s->common) && !s->should_complete) { + block_job_yield(&s->common); + } + s->common.cancelled = false; + goto immediate_exit; } length = DIV_ROUND_UP(s->common.len, s->granularity); |