[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 1/8] sheepdog: check return values of qemu_co_rec
From: |
MORITA Kazutaka |
Subject: |
[Qemu-devel] [PATCH v5 1/8] sheepdog: check return values of qemu_co_recv/send correctly |
Date: |
Thu, 24 Oct 2013 16:01:11 +0900 |
If qemu_co_recv/send doesn't return the specified length, it means
that an error happened.
Reviewed-by: Liu Yuan <address@hidden>
Signed-off-by: MORITA Kazutaka <address@hidden>
---
block/sheepdog.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 5f81c93..cb681de 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -489,13 +489,13 @@ static coroutine_fn int send_co_req(int sockfd,
SheepdogReq *hdr, void *data,
int ret;
ret = qemu_co_send(sockfd, hdr, sizeof(*hdr));
- if (ret < sizeof(*hdr)) {
+ if (ret != sizeof(*hdr)) {
error_report("failed to send a req, %s", strerror(errno));
return ret;
}
ret = qemu_co_send(sockfd, data, *wlen);
- if (ret < *wlen) {
+ if (ret != *wlen) {
error_report("failed to send a req, %s", strerror(errno));
}
@@ -541,7 +541,7 @@ static coroutine_fn void do_co_req(void *opaque)
qemu_aio_set_fd_handler(sockfd, restart_co_req, NULL, co);
ret = qemu_co_recv(sockfd, hdr, sizeof(*hdr));
- if (ret < sizeof(*hdr)) {
+ if (ret != sizeof(*hdr)) {
error_report("failed to get a rsp, %s", strerror(errno));
ret = -errno;
goto out;
@@ -553,7 +553,7 @@ static coroutine_fn void do_co_req(void *opaque)
if (*rlen) {
ret = qemu_co_recv(sockfd, data, *rlen);
- if (ret < *rlen) {
+ if (ret != *rlen) {
error_report("failed to get the data, %s", strerror(errno));
ret = -errno;
goto out;
@@ -664,7 +664,7 @@ static void coroutine_fn aio_read_response(void *opaque)
/* read a header */
ret = qemu_co_recv(fd, &rsp, sizeof(rsp));
- if (ret < 0) {
+ if (ret != sizeof(rsp)) {
error_report("failed to get the header, %s", strerror(errno));
goto out;
}
@@ -715,7 +715,7 @@ static void coroutine_fn aio_read_response(void *opaque)
case AIOCB_READ_UDATA:
ret = qemu_co_recvv(fd, acb->qiov->iov, acb->qiov->niov,
aio_req->iov_offset, rsp.data_length);
- if (ret < 0) {
+ if (ret != rsp.data_length) {
error_report("failed to get the data, %s", strerror(errno));
goto out;
}
@@ -1059,7 +1059,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
/* send a header */
ret = qemu_co_send(s->fd, &hdr, sizeof(hdr));
- if (ret < 0) {
+ if (ret != sizeof(hdr)) {
qemu_co_mutex_unlock(&s->lock);
error_report("failed to send a req, %s", strerror(errno));
return -errno;
@@ -1067,7 +1067,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
if (wlen) {
ret = qemu_co_sendv(s->fd, iov, niov, aio_req->iov_offset, wlen);
- if (ret < 0) {
+ if (ret != wlen) {
qemu_co_mutex_unlock(&s->lock);
error_report("failed to send a data, %s", strerror(errno));
return -errno;
--
1.7.10.4
- [Qemu-devel] [PATCH v5 0/8] sheepdog: reconnect server after connection failure, MORITA Kazutaka, 2013/10/24
- [Qemu-devel] [PATCH v5 5/8] sheepdog: try to reconnect to sheepdog after network error, MORITA Kazutaka, 2013/10/24
- [Qemu-devel] [PATCH v5 3/8] sheepdog: reload inode outside of resend_aioreq, MORITA Kazutaka, 2013/10/24
- [Qemu-devel] [PATCH v5 6/8] sheepdog: make add_aio_request and send_aioreq void functions, MORITA Kazutaka, 2013/10/24
- [Qemu-devel] [PATCH v5 1/8] sheepdog: check return values of qemu_co_recv/send correctly,
MORITA Kazutaka <=
- [Qemu-devel] [PATCH v5 7/8] sheepdog: cancel aio requests if possible, MORITA Kazutaka, 2013/10/24
- [Qemu-devel] [PATCH v5 8/8] sheepdog: check simultaneous create in resend_aioreq, MORITA Kazutaka, 2013/10/24
- [Qemu-devel] [PATCH v5 4/8] coroutine: add co_aio_sleep_ns() to allow sleep in block drivers, MORITA Kazutaka, 2013/10/24
- [Qemu-devel] [PATCH v5 2/8] sheepdog: handle vdi objects in resend_aio_req, MORITA Kazutaka, 2013/10/24
- Re: [Qemu-devel] [PATCH v5 0/8] sheepdog: reconnect server after connection failure, Liu Yuan, 2013/10/28