Commit 2e5c9ad6 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Paolo Bonzini
Browse files

nbd/server: rename rc to ret 



For consistency use 'ret' name for saving return code everywhere
in the file.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20170602150150.258222-12-vsementsov@virtuozzo.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d9faeed8

nbd/server.c

+19 −19
Original line number Diff line number Diff line
@@ -211,15 +211,15 @@ static int nbd_negotiate_send_rep_list(QIOChannel *ioc, NBDExport *exp) 
    uint32_t len;

    const char *name = exp->name ? exp->name : "";

    const char *desc = exp->description ? exp->description : "";

    int rc;

    int ret;



    TRACE("Advertising export name '%s' description '%s'", name, desc);

    name_len = strlen(name);

    desc_len = strlen(desc);

    len = name_len + desc_len + sizeof(len);

    rc = nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, len);

    if (rc < 0) {

        return rc;

    ret = nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, len);

    if (ret < 0) {

        return ret;

    }



    len = cpu_to_be32(name_len);
@@ -536,7 +536,7 @@ static int nbd_negotiate_options(NBDClient *client) 
static coroutine_fn int nbd_negotiate(NBDClient *client)

{

    char buf[8 + 8 + 8 + 128];

    int rc;

    int ret;

    const uint16_t myflags = (NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM |

                              NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA |

                              NBD_FLAG_SEND_WRITE_ZEROES);
@@ -593,10 +593,10 @@ static coroutine_fn int nbd_negotiate(NBDClient *client) 
            LOG("write failed");

            return -EINVAL;

        }

        rc = nbd_negotiate_options(client);

        if (rc != 0) {

        ret = nbd_negotiate_options(client);

        if (ret != 0) {

            LOG("option negotiation failed");

            return rc;

            return ret;

        }



        TRACE("advertising size %" PRIu64 " and flags %x",
@@ -604,10 +604,10 @@ static coroutine_fn int nbd_negotiate(NBDClient *client) 
        stq_be_p(buf + 18, client->exp->size);

        stw_be_p(buf + 26, client->exp->nbdflags | myflags);

        len = client->no_zeroes ? 10 : sizeof(buf) - 18;

        rc = nbd_write(client->ioc, buf + 18, len, NULL);

        if (rc < 0) {

        ret = nbd_write(client->ioc, buf + 18, len, NULL);

        if (ret < 0) {

            LOG("write failed");

            return rc;

            return ret;

        }

    }
@@ -963,21 +963,21 @@ void nbd_export_close_all(void) 
static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)

{

    NBDClient *client = req->client;

    int rc;

    int ret;



    g_assert(qemu_in_coroutine());

    qemu_co_mutex_lock(&client->send_lock);

    client->send_coroutine = qemu_coroutine_self();



    if (!len) {

        rc = nbd_send_reply(client->ioc, reply);

        ret = nbd_send_reply(client->ioc, reply);

    } else {

        qio_channel_set_cork(client->ioc, true);

        rc = nbd_send_reply(client->ioc, reply);

        if (rc == 0) {

            rc = nbd_write(client->ioc, req->data, len, NULL);

            if (rc < 0) {

                rc = -EIO;

        ret = nbd_send_reply(client->ioc, reply);

        if (ret == 0) {

            ret = nbd_write(client->ioc, req->data, len, NULL);

            if (ret < 0) {

                ret = -EIO;

            }

        }

        qio_channel_set_cork(client->ioc, false);
@@ -985,7 +985,7 @@ static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len) 


    client->send_coroutine = NULL;

    qemu_co_mutex_unlock(&client->send_lock);

    return rc;

    return ret;

}



/* nbd_co_receive_request