Re: [Qemu-devel] [PATCH v6 10/18] block/linux-aio: drop qemu_laio_completion_cb()

2013-07-29 Thread Wenchao Xia 
Reviewed-by: Wenchao Xia xiaw...@linux.vnet.ibm.com

 .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 stefa...@redhat.com
 ---
   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

[Qemu-devel] [PATCH v6 10/18] block/linux-aio: drop qemu_laio_completion_cb()

2013-07-25 Thread Stefan Hajnoczi 
.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 stefa...@redhat.com
---
 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;
 
-- 
1.8.1.4