From patchwork Fri Apr 9 09:46:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 49806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 845AFB7CF6 for ; Fri, 9 Apr 2010 20:13:55 +1000 (EST) Received: from localhost ([127.0.0.1]:60208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0BDk-00047I-Iz for incoming@patchwork.ozlabs.org; Fri, 09 Apr 2010 06:13:52 -0400 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 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o399lHtp019446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Apr 2010 05:47:17 -0400 Received: from localhost.localdomain (vpn1-4-18.ams2.redhat.com [10.36.4.18]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o399kvEK009943; Fri, 9 Apr 2010 05:47:16 -0400 From: Kevin Wolf To: aurelien@aurel32.net 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [STABLE][PATCH 08/10] block: Fix multiwrite memory leak in error case X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 {