Patchwork [v6,11/18] block/nbd: drop nbd_have_request()

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

Comments

Stefan Hajnoczi - July 25, 2013, 3:18 p.m.
.io_flush() is no longer called so drop nbd_have_request().  We cannot
drop in_flight since it is still used by other block/nbd.c code.

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

> .io_flush() is no longer called so drop nbd_have_request().  We cannot
> drop in_flight since it is still used by other block/nbd.c code.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   block/nbd.c | 13 +++----------
>   1 file changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/block/nbd.c b/block/nbd.c
> index 9c480b8..f1619f9 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -279,13 +279,6 @@ static void nbd_coroutine_start(BDRVNBDState *s, struct nbd_request *request)
>       request->handle = INDEX_TO_HANDLE(s, i);
>   }
> 
> -static int nbd_have_request(void *opaque)
> -{
> -    BDRVNBDState *s = opaque;
> -
> -    return s->in_flight > 0;
> -}
> -
>   static void nbd_reply_ready(void *opaque)
>   {
>       BDRVNBDState *s = opaque;
> @@ -342,7 +335,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request,
>       qemu_co_mutex_lock(&s->send_mutex);
>       s->send_coroutine = qemu_coroutine_self();
>       qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write,
> -                            nbd_have_request, s);
> +                            NULL, s);
>       if (qiov) {
>           if (!s->is_unix) {
>               socket_set_cork(s->sock, 1);
> @@ -362,7 +355,7 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request,
>           rc = nbd_send_request(s->sock, request);
>       }
>       qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL,
> -                            nbd_have_request, s);
> +                            NULL, s);
>       s->send_coroutine = NULL;
>       qemu_co_mutex_unlock(&s->send_mutex);
>       return rc;
> @@ -439,7 +432,7 @@ static int nbd_establish_connection(BlockDriverState *bs)
>        * kick the reply mechanism.  */
>       qemu_set_nonblock(sock);
>       qemu_aio_set_fd_handler(sock, nbd_reply_ready, NULL,
> -                            nbd_have_request, s);
> +                            NULL, s);
> 
>       s->sock = sock;
>       s->size = size;
>

Patch

diff --git a/block/nbd.c b/block/nbd.c
index 9c480b8..f1619f9 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -279,13 +279,6 @@  static void nbd_coroutine_start(BDRVNBDState *s, struct nbd_request *request)
     request->handle = INDEX_TO_HANDLE(s, i);
 }
 
-static int nbd_have_request(void *opaque)
-{
-    BDRVNBDState *s = opaque;
-
-    return s->in_flight > 0;
-}
-
 static void nbd_reply_ready(void *opaque)
 {
     BDRVNBDState *s = opaque;
@@ -342,7 +335,7 @@  static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request,
     qemu_co_mutex_lock(&s->send_mutex);
     s->send_coroutine = qemu_coroutine_self();
     qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write,
-                            nbd_have_request, s);
+                            NULL, s);
     if (qiov) {
         if (!s->is_unix) {
             socket_set_cork(s->sock, 1);
@@ -362,7 +355,7 @@  static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request,
         rc = nbd_send_request(s->sock, request);
     }
     qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL,
-                            nbd_have_request, s);
+                            NULL, s);
     s->send_coroutine = NULL;
     qemu_co_mutex_unlock(&s->send_mutex);
     return rc;
@@ -439,7 +432,7 @@  static int nbd_establish_connection(BlockDriverState *bs)
      * kick the reply mechanism.  */
     qemu_set_nonblock(sock);
     qemu_aio_set_fd_handler(sock, nbd_reply_ready, NULL,
-                            nbd_have_request, s);
+                            NULL, s);
 
     s->sock = sock;
     s->size = size;