Skip to content

Commit

Permalink
nbd: Pass return value from nbd_handle_list()
Browse files Browse the repository at this point in the history
While it does not make a difference in practice, nbd_receive_options()
generally returns -errno, so it should do that here as well; and the
easiest way to achieve this is by passing on the value returned by
nbd_handle_list().

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <1424887718-10800-7-git-send-email-mreitz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
XanClic authored and bonzini committed Mar 18, 2015
1 parent 2b1f13b commit 892f5a5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions nbd.c
Expand Up @@ -351,7 +351,7 @@ static int nbd_handle_export_name(NBDClient *client, uint32_t length)
static int nbd_receive_options(NBDClient *client)
{
while (1) {
int csock = client->sock;
int csock = client->sock, ret;
uint32_t tmp, length;
uint64_t magic;

Expand Down Expand Up @@ -398,8 +398,9 @@ static int nbd_receive_options(NBDClient *client)
TRACE("Checking option");
switch (be32_to_cpu(tmp)) {
case NBD_OPT_LIST:
if (nbd_handle_list(client, length) < 0) {
return 1;
ret = nbd_handle_list(client, length);
if (ret < 0) {
return ret;
}
break;

Expand Down

0 comments on commit 892f5a5

Please sign in to comment.