Commit 7ee1e2e6 authored Oct 15, 2019 by Vivek Goyal Committed by Miklos Szeredi Oct 21, 2019

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>

parent 51fecdd2

fs/fuse/virtio_fs.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -960,13 +960,6 @@ __releases(fiq->lock)

		fpq = &fs->vqs[queue_id].fud->pq;
		spin_lock(&fpq->lock);
		if (!fpq->connected) {
		spin_unlock(&fpq->lock);
		req->out.h.error = -ENODEV;
		pr_err("virtio-fs: %s disconnected\n", __func__);
		fuse_request_end(fc, req);
		return;
		}
		list_add_tail(&req->list, fpq->processing);
		spin_unlock(&fpq->lock);
		set_bit(FR_SENT, &req->flags);

Admin message