[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/12] nbd/server: nbd_negotiate: fix error path
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 09/12] nbd/server: nbd_negotiate: fix error path |
Date: |
Wed, 31 May 2017 19:55:38 +0300 |
Current code will return 0 on this nbd_write fail, as rc is 0
after successful nbd_negotiate_options. Fix this.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
nbd/server.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nbd/server.c b/nbd/server.c
index d376563527..ec163ad829 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 (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;
}
--
2.11.1
- [Qemu-devel] [PATCH 00/12] nbd refactoring part 1, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 07/12] nbd/server: refactor nbd_co_receive_request, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 06/12] nbd/server: get rid of EAGAIN dead code, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 05/12] nbd/server: refactor nbd_co_send_reply, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 09/12] nbd/server: nbd_negotiate: fix error path,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 04/12] nbd/server: get rid of ssize_t, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 02/12] nbd: make nbd_drop public, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 11/12] nbd/server: rename rc to ret, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 12/12] nbd/server: refactor nbd_trip, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 03/12] nbd/server: get rid of nbd_negotiate_read and friends, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 10/12] nbd/server: get rid of fail: return rc, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 08/12] nbd/server: remove NBDClientNewData, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 01/12] nbd: rename read_sync and friends, Vladimir Sementsov-Ogievskiy, 2017/05/31