Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0AoI-0004QV-Hb for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:34 -0400 Received: from [140.186.70.92] (port=44352 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0AoF-0004NM-FI for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0Ao7-0005yR-W7 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62192) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0Ao7-0005yI-BW for qemu-devel@nongnu.org; Fri, 09 Apr 2010 05:47:23 -0400 From: Kevin Wolf Date: Fri, 9 Apr 2010 11:46:26 +0200 Message-Id: <1270806388-28138-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1270806388-28138-1-git-send-email-kwolf@redhat.com> References: <1270806388-28138-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE][PATCH 08/10] block: Fix multiwrite memory leak in error case List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aurelien@aurel32.net Cc: kwolf@redhat.com, qemu-devel@nongnu.org Previously multiwrite_user_cb was never called if a request in the multiwrite batch failed right away because it did set mcb->error immediately. Make it look more like a normal callback to fix this. Reported-by: Juan Quintela Signed-off-by: Kevin Wolf --- block.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index d537d10..4f9a48b 100644 --- a/block.c +++ b/block.c @@ -1761,7 +1761,8 @@ int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs, int num_reqs) reqs[i].error = -EIO; goto fail; } else { - mcb->error = -EIO; + mcb->num_requests++; + multiwrite_cb(mcb, -EIO); break; } } else { -- 1.6.6.1