Patchwork [v6,09/18] block/iscsi: drop iscsi_process_flush()

login
register
mail settings
Submitter Stefan Hajnoczi
Date July 25, 2013, 3:18 p.m.
Message ID <1374765505-14356-10-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/261770/
State New
Headers show

Comments

Stefan Hajnoczi - July 25, 2013, 3:18 p.m.
.io_flush() is no longer called so drop iscsi_process_flush().

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/iscsi.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
Wayne Xia - July 29, 2013, 8:17 a.m.
Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>

> .io_flush() is no longer called so drop iscsi_process_flush().
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   block/iscsi.c | 9 +--------
>   1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 5f28c6a..e2692d6 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -146,13 +146,6 @@ static const AIOCBInfo iscsi_aiocb_info = {
>   static void iscsi_process_read(void *arg);
>   static void iscsi_process_write(void *arg);
> 
> -static int iscsi_process_flush(void *arg)
> -{
> -    IscsiLun *iscsilun = arg;
> -
> -    return iscsi_queue_length(iscsilun->iscsi) > 0;
> -}
> -
>   static void
>   iscsi_set_events(IscsiLun *iscsilun)
>   {
> @@ -166,7 +159,7 @@ iscsi_set_events(IscsiLun *iscsilun)
>           qemu_aio_set_fd_handler(iscsi_get_fd(iscsi),
>                         iscsi_process_read,
>                         (ev & POLLOUT) ? iscsi_process_write : NULL,
> -                      iscsi_process_flush,
> +                      NULL,
>                         iscsilun);
> 
>       }
>

Patch

diff --git a/block/iscsi.c b/block/iscsi.c
index 5f28c6a..e2692d6 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -146,13 +146,6 @@  static const AIOCBInfo iscsi_aiocb_info = {
 static void iscsi_process_read(void *arg);
 static void iscsi_process_write(void *arg);
 
-static int iscsi_process_flush(void *arg)
-{
-    IscsiLun *iscsilun = arg;
-
-    return iscsi_queue_length(iscsilun->iscsi) > 0;
-}
-
 static void
 iscsi_set_events(IscsiLun *iscsilun)
 {
@@ -166,7 +159,7 @@  iscsi_set_events(IscsiLun *iscsilun)
         qemu_aio_set_fd_handler(iscsi_get_fd(iscsi),
                       iscsi_process_read,
                       (ev & POLLOUT) ? iscsi_process_write : NULL,
-                      iscsi_process_flush,
+                      NULL,
                       iscsilun);
 
     }