[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] virtiofsd: Check EOF before short read
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 07/15] virtiofsd: Check EOF before short read |
Date: |
Wed, 26 May 2021 18:45:32 +0100 |
From: Vivek Goyal <vgoyal@redhat.com>
In virtio_send_data_iov() we are checking first for short read and then
EOF condition. Change the order. Basically check for error and EOF first
and last remaining piece is short ready which will lead to retry
automatically at the end of while loop.
Just that it is little simpler to read to the code. There is no need
to call "continue" and also one less call of "len-=ret".
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Connor Kuehl <ckuehl@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Message-Id: <20210518213538.693422-7-vgoyal@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tools/virtiofsd/fuse_virtio.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
index 49c7dd788a..99f91c9d87 100644
--- a/tools/virtiofsd/fuse_virtio.c
+++ b/tools/virtiofsd/fuse_virtio.c
@@ -410,25 +410,24 @@ int virtio_send_data_iov(struct fuse_session *se, struct
fuse_chan *ch,
__func__, len);
goto err;
}
- fuse_log(FUSE_LOG_DEBUG, "%s: preadv ret=%d len=%zd\n", __func__,
- ret, len);
- if (ret < len && ret) {
- fuse_log(FUSE_LOG_DEBUG, "%s: ret < len\n", __func__);
- /* Skip over this much next time around */
- iov_discard_front(&in_sg_ptr, &in_sg_cpy_count, ret);
- buf->buf[0].pos += ret;
- len -= ret;
- /* Lets do another read */
- continue;
- }
if (!ret) {
/* EOF case? */
fuse_log(FUSE_LOG_DEBUG, "%s: !ret len remaining=%zd\n", __func__,
len);
break;
}
+ fuse_log(FUSE_LOG_DEBUG, "%s: preadv ret=%d len=%zd\n", __func__,
+ ret, len);
+
len -= ret;
+ /* Short read. Retry reading remaining bytes */
+ if (len) {
+ fuse_log(FUSE_LOG_DEBUG, "%s: ret < len\n", __func__);
+ /* Skip over this much next time around */
+ iov_discard_front(&in_sg_ptr, &in_sg_cpy_count, ret);
+ buf->buf[0].pos += ret;
+ }
} while (len);
/* Need to fix out->len on EOF */
--
2.31.1
- [PULL 00/15] migration/virtiofs/hmp queue, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 02/15] virtiofsd: Check for EINTR in preadv() and retry, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 01/15] hmp: Fix loadvm to resume the VM on success instead of failure, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 03/15] virtiofsd: Get rid of unreachable code in read, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 05/15] virtiofsd: get rid of in_sg_left variable, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 04/15] virtiofsd: Use iov_discard_front() to skip bytes, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 06/15] virtiofsd: Simplify skip byte logic, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 08/15] virtiofsd: Set req->reply_sent right after sending reply, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 07/15] virtiofsd: Check EOF before short read,
Dr. David Alan Gilbert (git) <=
- [PULL 10/15] tools/virtiofsd/fuse_opt.c: Replaced a malloc with GLib's g_try_malloc, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 11/15] migration/rdma: Fix cm_event used before being initialized, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 14/15] migration/rdma: destination: create the return patch after the first accept, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 15/15] migration/rdma: source: poll cm_event from return path, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 09/15] tools/virtiofsd/buffer.c: replaced a calloc call with GLib's g_try_new0, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 12/15] migration/rdma: cleanup rdma in rdma_start_incoming_migration error path, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 13/15] migration/rdma: Fix rdma_addrinfo res leaks, Dr. David Alan Gilbert (git), 2021/05/26
- Re: [PULL 00/15] migration/virtiofs/hmp queue, Peter Maydell, 2021/05/27