summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2019-10-15 13:46:23 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2019-10-21 09:57:07 -0400
commit7ee1e2e631dbf0ff0df2a67a1e01ba3c1dce7a46 (patch)
treebf400ed515d2997f85285994c0fb73cd322908c0
parent51fecdd2555b3e0e05a78d30093c638d164a32f9 (diff)
virtiofs: No need to check fpq->connected state
In virtiofs we keep per queue connected state in virtio_fs_vq->connected and use that to end request if queue is not connected. And virtiofs does not even touch fpq->connected state. We probably need to merge these two at some point of time. For now, simplify the code a bit and do not worry about checking state of fpq->connected. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-rw-r--r--fs/fuse/virtio_fs.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index 7ea58606cc1d..a2724b77221d 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -960,13 +960,6 @@ __releases(fiq->lock)
960 960
961 fpq = &fs->vqs[queue_id].fud->pq; 961 fpq = &fs->vqs[queue_id].fud->pq;
962 spin_lock(&fpq->lock); 962 spin_lock(&fpq->lock);
963 if (!fpq->connected) {
964 spin_unlock(&fpq->lock);
965 req->out.h.error = -ENODEV;
966 pr_err("virtio-fs: %s disconnected\n", __func__);
967 fuse_request_end(fc, req);
968 return;
969 }
970 list_add_tail(&req->list, fpq->processing); 963 list_add_tail(&req->list, fpq->processing);
971 spin_unlock(&fpq->lock); 964 spin_unlock(&fpq->lock);
972 set_bit(FR_SENT, &req->flags); 965 set_bit(FR_SENT, &req->flags);