[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/15] virtiofsd: Set req->reply_sent right after sending reply
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 08/15] virtiofsd: Set req->reply_sent right after sending reply |
Date: |
Wed, 26 May 2021 18:45:33 +0100 |
From: Vivek Goyal <vgoyal@redhat.com>
There is no reason to set it in label "err". We should be able to set
it right after sending reply. It is easier to read.
Also got rid of label "err" because now only thing it was doing was
return a code. We can return from the error location itself and no
need to first jump to label "err".
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-8-vgoyal@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tools/virtiofsd/fuse_virtio.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c
index 99f91c9d87..fa4aff9b0e 100644
--- a/tools/virtiofsd/fuse_virtio.c
+++ b/tools/virtiofsd/fuse_virtio.c
@@ -366,14 +366,12 @@ int virtio_send_data_iov(struct fuse_session *se, struct
fuse_chan *ch,
if (in_len < sizeof(struct fuse_out_header)) {
fuse_log(FUSE_LOG_ERR, "%s: elem %d too short for out_header\n",
__func__, elem->index);
- ret = E2BIG;
- goto err;
+ return E2BIG;
}
if (in_len < tosend_len) {
fuse_log(FUSE_LOG_ERR, "%s: elem %d too small for data len %zd\n",
__func__, elem->index, tosend_len);
- ret = E2BIG;
- goto err;
+ return E2BIG;
}
/* TODO: Limit to 'len' */
@@ -408,7 +406,7 @@ int virtio_send_data_iov(struct fuse_session *se, struct
fuse_chan *ch,
}
fuse_log(FUSE_LOG_DEBUG, "%s: preadv failed (%m) len=%zd\n",
__func__, len);
- goto err;
+ return ret;
}
if (!ret) {
@@ -438,21 +436,14 @@ int virtio_send_data_iov(struct fuse_session *se, struct
fuse_chan *ch,
out_sg->len = tosend_len;
}
- ret = 0;
-
vu_dispatch_rdlock(qi->virtio_dev);
pthread_mutex_lock(&qi->vq_lock);
vu_queue_push(dev, q, elem, tosend_len);
vu_queue_notify(dev, q);
pthread_mutex_unlock(&qi->vq_lock);
vu_dispatch_unlock(qi->virtio_dev);
-
-err:
- if (ret == 0) {
- req->reply_sent = true;
- }
-
- return ret;
+ req->reply_sent = true;
+ return 0;
}
static __thread bool clone_fs_called;
--
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) <=
- [PULL 07/15] virtiofsd: Check EOF before short read, Dr. David Alan Gilbert (git), 2021/05/26
- [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