qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Chrysostomos Nanakos <cnanakos@grnet.gr>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Liu Yuan <namei.unix@gmail.com>, Peter Lieven <pl@kamp.de>,
	Ronnie Sahlberg <ronniesahlberg@gmail.com>,
	Josh Durgin <josh.durgin@inktank.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>,
	Benoit Canet <benoit@irqsave.net>
Subject: [Qemu-devel] [PATCH v4 15/20] quorum: Convert quorum_aiocb_info.cancel to .cancel_async
Date: Wed,  3 Sep 2014 19:23:50 +0800	[thread overview]
Message-ID: <1409743435-21155-16-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1409743435-21155-1-git-send-email-famz@redhat.com>

Before, we cancel all the child requests with bdrv_aio_cancel, then free
the acb..

Now we just kick off asynchronous cancellation of child requests and
return, we know quorum_aio_cb will be called later, so in the end
quorum_aio_finalize will take care of calling the caller's cb.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/quorum.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/block/quorum.c b/block/quorum.c
index 093382e..0951d52 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -138,16 +138,13 @@ static void quorum_aio_cancel(BlockDriverAIOCB *blockacb)
 
     /* cancel all callbacks */
     for (i = 0; i < s->num_children; i++) {
-        bdrv_aio_cancel(acb->qcrs[i].aiocb);
+        bdrv_aio_cancel_async(acb->qcrs[i].aiocb);
     }
-
-    g_free(acb->qcrs);
-    qemu_aio_release(acb);
 }
 
 static AIOCBInfo quorum_aiocb_info = {
     .aiocb_size         = sizeof(QuorumAIOCB),
-    .cancel             = quorum_aio_cancel,
+    .cancel_async       = quorum_aio_cancel,
 };
 
 static void quorum_aio_finalize(QuorumAIOCB *acb)
-- 
2.1.0.27.g96db324

  parent reply	other threads:[~2014-09-03 11:26 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-03 11:23 [Qemu-devel] [PATCH v4 00/20] block: Asynchronous request cancellation Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 01/20] block: Add refcnt in BlockDriverAIOCB Fam Zheng
2014-09-04 15:07   ` Benoît Canet
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 02/20] block: Add bdrv_aio_cancel_async Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 03/20] block: Drop bdrv_em_co_aiocb_info.cancel Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 04/20] block: Convert bdrv_em_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-03 11:28   ` Paolo Bonzini
2014-09-04  1:20     ` Fam Zheng
2014-09-04  5:45       ` Paolo Bonzini
2014-09-04 15:21   ` Benoît Canet
2014-09-05 10:55     ` Fam Zheng
2014-09-05 11:06       ` Benoît Canet
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 05/20] thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async Fam Zheng
2014-09-04 15:29   ` Benoît Canet
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 06/20] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 07/20] dma: Check iov pointer before unmap memory Fam Zheng
2014-09-03 11:38   ` Paolo Bonzini
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 08/20] dma: Convert dma_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 09/20] iscsi: Convert iscsi_aiocb_info.cancel " Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 10/20] archipelago: Drop archipelago_aiocb_info.cancel Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 11/20] blkdebug: Convert blkdebug_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-03 11:42   ` Paolo Bonzini
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 12/20] blkverify: Drop blkverify_aiocb_info.cancel Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 13/20] curl: Drop curl_aiocb_info.cancel Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 14/20] qed: Drop qed_aiocb_info.cancel Fam Zheng
2014-09-03 11:23 ` Fam Zheng [this message]
2014-09-04 15:40   ` [Qemu-devel] [PATCH v4 15/20] quorum: Convert quorum_aiocb_info.cancel to .cancel_async Benoît Canet
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 16/20] rbd: Drop rbd_aiocb_info.cancel Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 17/20] sheepdog: Convert sd_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 18/20] win32-aio: Drop win32_aiocb_info.cancel Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 19/20] ide: Convert trim_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-03 11:23 ` [Qemu-devel] [PATCH v4 20/20] block: Drop AIOCBInfo.cancel Fam Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1409743435-21155-16-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=benoit@irqsave.net \
    --cc=cnanakos@grnet.gr \
    --cc=josh.durgin@inktank.com \
    --cc=kwolf@redhat.com \
    --cc=morita.kazutaka@lab.ntt.co.jp \
    --cc=namei.unix@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=pl@kamp.de \
    --cc=qemu-devel@nongnu.org \
    --cc=ronniesahlberg@gmail.com \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).