ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd/server: rename rc to ret 

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170602150150.258222-12-vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2017-06-02 18:01:49 +03:00 committed by Paolo Bonzini
parent d9faeed854
commit 2e5c9ad6f4
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nbd/server.c
View File

@ -211,15 +211,15 @@ static int nbd_negotiate_send_rep_list(QIOChannel *ioc, NBDExport *exp)
uint32_t len; uint32_t len;
const char *name = exp->name ? exp->name : ""; const char *name = exp->name ? exp->name : "";
const char *desc = exp->description ? exp->description : ""; const char *desc = exp->description ? exp->description : "";
int rc; int ret;
TRACE("Advertising export name '%s' description '%s'", name, desc); TRACE("Advertising export name '%s' description '%s'", name, desc);
name_len = strlen(name); name_len = strlen(name);
desc_len = strlen(desc); desc_len = strlen(desc);
len = name_len + desc_len + sizeof(len); len = name_len + desc_len + sizeof(len);
rc = nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, len); ret = nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, len);
if (rc < 0) { if (ret < 0) {
return rc; return ret;
} }
len = cpu_to_be32(name_len); 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) static coroutine_fn int nbd_negotiate(NBDClient *client)
{ {
char buf[8 + 8 + 8 + 128]; char buf[8 + 8 + 8 + 128];
int rc; int ret;
const uint16_t myflags = (NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM | const uint16_t myflags = (NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM |
NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA | NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA |
NBD_FLAG_SEND_WRITE_ZEROES); NBD_FLAG_SEND_WRITE_ZEROES);
@ -593,10 +593,10 @@ static coroutine_fn int nbd_negotiate(NBDClient *client)
LOG("write failed"); LOG("write failed");
return -EINVAL; return -EINVAL;
} }
rc = nbd_negotiate_options(client); ret = nbd_negotiate_options(client);
if (rc != 0) { if (ret != 0) {
LOG("option negotiation failed"); LOG("option negotiation failed");
return rc; return ret;
} }
TRACE("advertising size %" PRIu64 " and flags %x", 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); stq_be_p(buf + 18, client->exp->size);
stw_be_p(buf + 26, client->exp->nbdflags | myflags); stw_be_p(buf + 26, client->exp->nbdflags | myflags);
len = client->no_zeroes ? 10 : sizeof(buf) - 18; len = client->no_zeroes ? 10 : sizeof(buf) - 18;
rc = nbd_write(client->ioc, buf + 18, len, NULL); ret = nbd_write(client->ioc, buf + 18, len, NULL);
if (rc < 0) { if (ret < 0) {
LOG("write failed"); 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) static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
{ {
NBDClient *client = req->client; NBDClient *client = req->client;
int rc; int ret;
g_assert(qemu_in_coroutine()); g_assert(qemu_in_coroutine());
qemu_co_mutex_lock(&client->send_lock); qemu_co_mutex_lock(&client->send_lock);
client->send_coroutine = qemu_coroutine_self(); client->send_coroutine = qemu_coroutine_self();
if (!len) { if (!len) {
rc = nbd_send_reply(client->ioc, reply); ret = nbd_send_reply(client->ioc, reply);
} else { } else {
qio_channel_set_cork(client->ioc, true); qio_channel_set_cork(client->ioc, true);
rc = nbd_send_reply(client->ioc, reply); ret = nbd_send_reply(client->ioc, reply);
if (rc == 0) { if (ret == 0) {
rc = nbd_write(client->ioc, req->data, len, NULL); ret = nbd_write(client->ioc, req->data, len, NULL);
if (rc < 0) { if (ret < 0) {
rc = -EIO; ret = -EIO;
} }
} }
qio_channel_set_cork(client->ioc, false); 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; client->send_coroutine = NULL;
qemu_co_mutex_unlock(&client->send_lock); qemu_co_mutex_unlock(&client->send_lock);
return rc; return ret;
} }
/* nbd_co_receive_request /* nbd_co_receive_request