From: Vivek Goyal <vgoyal@redhat.com>
To: qemu-devel@nongnu.org, virtio-fs@redhat.com
Cc: dgilbert@redhat.com, vgoyal@redhat.com
Subject: [PATCH 3/7] virtiofsd: Use iov_discard_front() to skip bytes
Date: Tue, 11 May 2021 17:37:32 -0400 [thread overview]
Message-ID: <20210511213736.281016-4-vgoyal@redhat.com> (raw)
In-Reply-To: <20210511213736.281016-1-vgoyal@redhat.com>
There are places where we need to skip few bytes from front of the iovec
array. We have our own custom code for that. Looks like iov_discard_front()
can do same thing. So use that helper instead.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
tools/virtiofsd/fuse_virtio.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
index 5dcd08fccb..d56b225800 100644
--- a/tools/virtiofsd/fuse_virtio.c
+++ b/tools/virtiofsd/fuse_virtio.c
@@ -389,23 +389,15 @@ int virtio_send_data_iov(struct fuse_session *se, struct fuse_chan *ch,
memcpy(in_sg_cpy, in_sg, sizeof(struct iovec) * in_num);
/* These get updated as we skip */
struct iovec *in_sg_ptr = in_sg_cpy;
- int in_sg_cpy_count = in_num;
+ unsigned int in_sg_cpy_count = in_num;
/* skip over parts of in_sg that contained the header iov */
size_t skip_size = iov_len;
size_t in_sg_left = 0;
do {
- while (skip_size != 0 && in_sg_cpy_count) {
- if (skip_size >= in_sg_ptr[0].iov_len) {
- skip_size -= in_sg_ptr[0].iov_len;
- in_sg_ptr++;
- in_sg_cpy_count--;
- } else {
- in_sg_ptr[0].iov_len -= skip_size;
- in_sg_ptr[0].iov_base += skip_size;
- break;
- }
+ if (skip_size != 0) {
+ iov_discard_front(&in_sg_ptr, &in_sg_cpy_count, skip_size);
}
int i;
--
2.25.4
next prev parent reply other threads:[~2021-05-11 21:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-11 21:37 [PATCH 0/7] virtiofsd: Few cleanups in virtio_send_data_iov() Vivek Goyal
2021-05-11 21:37 ` [PATCH 1/7] virtiofsd: Check for EINTR in preadv() and retry Vivek Goyal
2021-05-18 11:59 ` Dr. David Alan Gilbert
2021-05-11 21:37 ` [PATCH 2/7] virtiofsd: Get rid of unreachable code in read Vivek Goyal
2021-05-18 12:01 ` Dr. David Alan Gilbert
2021-05-11 21:37 ` Vivek Goyal [this message]
2021-05-18 12:10 ` [PATCH 3/7] virtiofsd: Use iov_discard_front() to skip bytes Dr. David Alan Gilbert
2021-05-11 21:37 ` [PATCH 4/7] virtiofsd: get rid of in_sg_left variable Vivek Goyal
2021-05-18 12:19 ` Dr. David Alan Gilbert
2021-05-11 21:37 ` [PATCH 5/7] virtiofsd: Simplify skip byte logic Vivek Goyal
2021-05-18 12:26 ` Dr. David Alan Gilbert
2021-05-11 21:37 ` [PATCH 6/7] virtiofsd: Check EOF before short read Vivek Goyal
2021-05-18 12:31 ` Dr. David Alan Gilbert
2021-05-11 21:37 ` [PATCH 7/7] virtiofsd: Set req->reply_sent right after sending reply Vivek Goyal
2021-05-13 20:50 ` [Virtio-fs] " Connor Kuehl
2021-05-17 13:08 ` Vivek Goyal
2021-05-18 12:34 ` Dr. David Alan Gilbert
2021-05-18 12:32 ` Dr. David Alan Gilbert
2021-05-11 21:48 ` [PATCH 0/7] virtiofsd: Few cleanups in virtio_send_data_iov() no-reply
2021-05-13 20:50 ` [Virtio-fs] " Connor Kuehl
2021-05-17 13:08 ` Vivek Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210511213736.281016-4-vgoyal@redhat.com \
--to=vgoyal@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=virtio-fs@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).