From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOMHF-0007Y8-Fp for qemu-devel@nongnu.org; Mon, 01 Sep 2014 03:43:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XOMH9-0003d3-HE for qemu-devel@nongnu.org; Mon, 01 Sep 2014 03:43:49 -0400 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]:49116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOMH9-0003cx-AE for qemu-devel@nongnu.org; Mon, 01 Sep 2014 03:43:43 -0400 Received: by mail-pa0-f48.google.com with SMTP id ey11so11598571pad.7 for ; Mon, 01 Sep 2014 00:43:39 -0700 (PDT) From: Liu Yuan Date: Mon, 1 Sep 2014 15:43:10 +0800 Message-Id: <1409557394-11853-5-git-send-email-namei.unix@gmail.com> In-Reply-To: <1409557394-11853-1-git-send-email-namei.unix@gmail.com> References: <1409557394-11853-1-git-send-email-namei.unix@gmail.com> Subject: [Qemu-devel] [PATCH 4/8] block/quorum: add quorum_aio_release() helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Benoit Canet , Stefan Hajnoczi Cc: Eric Blake Cc: Benoit Canet Cc: Kevin Wolf Cc: Stefan Hajnoczi Signed-off-by: Liu Yuan --- block/quorum.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index 5866bca..9e056d6 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -130,6 +130,12 @@ struct QuorumAIOCB { static bool quorum_vote(QuorumAIOCB *acb); +static void quorum_aio_release(QuorumAIOCB *acb) +{ + g_free(acb->qcrs); + qemu_aio_release(acb); +} + static void quorum_aio_cancel(BlockDriverAIOCB *blockacb) { QuorumAIOCB *acb = container_of(blockacb, QuorumAIOCB, common); @@ -141,8 +147,7 @@ static void quorum_aio_cancel(BlockDriverAIOCB *blockacb) bdrv_aio_cancel(acb->qcrs[i].aiocb); } - g_free(acb->qcrs); - qemu_aio_release(acb); + quorum_aio_release(acb); } static AIOCBInfo quorum_aiocb_info = { @@ -168,8 +173,7 @@ static void quorum_aio_finalize(QuorumAIOCB *acb) } } - g_free(acb->qcrs); - qemu_aio_release(acb); + quorum_aio_release(acb); } static bool quorum_sha256_compare(QuorumVoteValue *a, QuorumVoteValue *b) -- 1.9.1