Commit bed2e759 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

block/nbd: drop nbd_have_request() 



.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: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 94473d0c

block/nbd.c

+3 −10
Original line number Diff line number Diff line
@@ -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;