Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NzBa2-0001uO-BQ for qemu-devel@nongnu.org; Tue, 06 Apr 2010 12:24:46 -0400 Received: from [140.186.70.92] (port=41672 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzBa0-0001sS-PB for qemu-devel@nongnu.org; Tue, 06 Apr 2010 12:24:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NzBZz-0006vR-EI for qemu-devel@nongnu.org; Tue, 06 Apr 2010 12:24:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42481) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NzBZz-0006vK-6H for qemu-devel@nongnu.org; Tue, 06 Apr 2010 12:24:43 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o36GOg3O023904 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 6 Apr 2010 12:24:42 -0400 From: Kevin Wolf Date: Tue, 6 Apr 2010 18:24:07 +0200 Message-Id: <1270571047-1208-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1270571047-1208-1-git-send-email-kwolf@redhat.com> References: <1270571047-1208-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com 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 ae5aba3..ed4c819 100644 --- a/block.c +++ b/block.c @@ -1893,7 +1893,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