[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 07/19] nbd/server: nbd_negotiate: fix error path
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH 07/19] nbd/server: nbd_negotiate: fix error path |
Date: |
Tue, 30 May 2017 16:12:14 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 |
On 05/30/2017 09:30 AM, Vladimir Sementsov-Ogievskiy wrote:
> Current code will return 0 on this write_sync fail, as rc is 0
> after successful nbd_negotiate_options. Fix this.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> ---
> nbd/server.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
Reviewed-by: Eric Blake <address@hidden>
> diff --git a/nbd/server.c b/nbd/server.c
> index 3d4cd3d21c..984fad4bdb 100644
> --- a/nbd/server.c
> +++ b/nbd/server.c
> @@ -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 (write_sync(client->ioc, buf + 18, len, NULL) < 0) {
> + rc = write_sync(client->ioc, buf + 18, len, NULL);
> + if (rc < 0) {
> LOG("write failed");
> goto fail;
> }
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-devel] [PATCH 00/19] nbd errors and traces refactoring, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 11/19] io/channel-socket: qio_channel_socket_writev handle EPIPE, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 08/19] nbd/server: get rid of fail: return rc, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 07/19] nbd/server: nbd_negotiate: fix error path, Vladimir Sementsov-Ogievskiy, 2017/05/30
- Re: [Qemu-devel] [PATCH 07/19] nbd/server: nbd_negotiate: fix error path,
Eric Blake <=
- [Qemu-devel] [PATCH 10/19] nbd/server: refactor nbd_trip, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 13/19] nbd/server: return original error codes, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 09/19] nbd/server: rename rc to ret, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 05/19] nbd/server: refactor nbd_co_receive_request, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 12/19] nbd/common: nbd_wr_syncv handle QIO_CHANNEL_ERR_EPIPE, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 18/19] nbd/client: refactor TRACE of NBD_MAGIC, Vladimir Sementsov-Ogievskiy, 2017/05/30
- [Qemu-devel] [PATCH 14/19] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Vladimir Sementsov-Ogievskiy, 2017/05/30