Commit 7798d3aa authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Paolo Bonzini
Browse files

nbd/server: nbd_negotiate: fix error path 



Current code will return 0 on this nbd_write fail, as rc is 0
after successful nbd_negotiate_options. Fix this.

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

nbd/server.c

+2 −1
Original line number Diff line number Diff line
@@ -607,7 +607,8 @@ 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;

        if (nbd_write(client->ioc, buf + 18, len, NULL) < 0) {

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

        if (rc < 0) {

            LOG("write failed");

            goto fail;

        }