From: Fam Zheng <famz@redhat.com>
Date: Tue, 29 Apr 2014 10:09:09 +0000 (+0800)
Subject: mirror: Fix resource leak when bdrv_getlength fails
X-Git-Tag: qemu-xen-4.5.0-rc1^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=520b3412643ed6907809a1e0711eae497aaa8b54;p=qemu-xen.git

mirror: Fix resource leak when bdrv_getlength fails

The direct return will skip releasing of all the resouces at
immediate_exit, don't miss that.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 373df5b135b4a54e0abb394e9e703fef3ded093c)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/block/mirror.c b/block/mirror.c
index 0ef41f999e..9a0a55940c 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -325,8 +325,8 @@ static void coroutine_fn mirror_run(void *opaque)
 
     s->common.len = bdrv_getlength(bs);
     if (s->common.len <= 0) {
-        block_job_completed(&s->common, s->common.len);
-        return;
+        ret = s->common.len;
+        goto immediate_exit;
     }
 
     length = (bdrv_getlength(bs) + s->granularity - 1) / s->granularity;