From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3ig8-0006Td-QW for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:19:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3ifz-0002yg-43 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:19:40 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:47791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3ify-0002yJ-IY for qemu-devel@nongnu.org; Mon, 29 Jul 2013 04:19:31 -0400 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 29 Jul 2013 18:11:32 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 007FD2BB0054 for ; Mon, 29 Jul 2013 18:19:26 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6T83ljx54526058 for ; Mon, 29 Jul 2013 18:03:47 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r6T8JPWs023055 for ; Mon, 29 Jul 2013 18:19:25 +1000 Message-ID: <51F62587.9050409@linux.vnet.ibm.com> Date: Mon, 29 Jul 2013 16:19:19 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1374765505-14356-1-git-send-email-stefanha@redhat.com> <1374765505-14356-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1374765505-14356-11-git-send-email-stefanha@redhat.com> Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 10/18] block/linux-aio: drop qemu_laio_completion_cb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , Ping Fan Liu , qemu-devel@nongnu.org, Michael Roth , alex@alex.org.uk, Paolo Bonzini Reviewed-by: Wenchao Xia > .io_flush() is no longer called so drop qemu_laio_completion_cb(). It > turns out that count is now unused so drop that too. > > Signed-off-by: Stefan Hajnoczi > --- > block/linux-aio.c | 17 ++--------------- > 1 file changed, 2 insertions(+), 15 deletions(-) > > diff --git a/block/linux-aio.c b/block/linux-aio.c > index ee0f8d1..d9128f3 100644 > --- a/block/linux-aio.c > +++ b/block/linux-aio.c > @@ -39,7 +39,6 @@ struct qemu_laiocb { > struct qemu_laio_state { > io_context_t ctx; > EventNotifier e; > - int count; > }; > > static inline ssize_t io_event_ret(struct io_event *ev) > @@ -55,8 +54,6 @@ static void qemu_laio_process_completion(struct qemu_laio_state *s, > { > int ret; > > - s->count--; > - > ret = laiocb->ret; > if (ret != -ECANCELED) { > if (ret == laiocb->nbytes) { > @@ -101,13 +98,6 @@ static void qemu_laio_completion_cb(EventNotifier *e) > } > } > > -static int qemu_laio_flush_cb(EventNotifier *e) > -{ > - struct qemu_laio_state *s = container_of(e, struct qemu_laio_state, e); > - > - return (s->count > 0) ? 1 : 0; > -} > - > static void laio_cancel(BlockDriverAIOCB *blockacb) > { > struct qemu_laiocb *laiocb = (struct qemu_laiocb *)blockacb; > @@ -177,14 +167,11 @@ BlockDriverAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, > goto out_free_aiocb; > } > io_set_eventfd(&laiocb->iocb, event_notifier_get_fd(&s->e)); > - s->count++; > > if (io_submit(s->ctx, 1, &iocbs) < 0) > - goto out_dec_count; > + goto out_free_aiocb; > return &laiocb->common; > > -out_dec_count: > - s->count--; > out_free_aiocb: > qemu_aio_release(laiocb); > return NULL; > @@ -204,7 +191,7 @@ void *laio_init(void) > } > > qemu_aio_set_event_notifier(&s->e, qemu_laio_completion_cb, > - qemu_laio_flush_cb); > + NULL); > > return s; > -- Best Regards Wenchao Xia