2019-09-05 23:08:07

by Vivek Goyal

[permalink] [raw]

Subject: [PATCH 01/18] virtiofs: Remove request from processing list before calling end

---

In error path we are calling fuse_request_end() but we need to clear
FR_SENT bit as well as remove request from processing queue. Otherwise
fuse_request_end() triggers a warning as well as other issues show up.

Signed-off-by: Vivek Goyal <[email protected]>
---
fs/fuse/virtio_fs.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index 197e79e536f9..a708ccb65662 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -826,6 +826,10 @@ __releases(fiq->waitq.lock)
}
req->out.h.error = ret;
pr_err("virtio-fs: virtio_fs_enqueue_req() failed %d\n", ret);
+ spin_lock(&fpq->lock);
+ clear_bit(FR_SENT, &req->flags);
+ list_del_init(&req->list);
+ spin_unlock(&fpq->lock);
fuse_request_end(fc, req);
return;
}
--
2.20.1

2019-09-06 11:30:09

by Stefan Hajnoczi

[permalink] [raw]

Subject: Re: [PATCH 01/18] virtiofs: Remove request from processing list before calling end

---

On Thu, Sep 05, 2019 at 03:48:42PM -0400, Vivek Goyal wrote:
> In error path we are calling fuse_request_end() but we need to clear
> FR_SENT bit as well as remove request from processing queue. Otherwise
> fuse_request_end() triggers a warning as well as other issues show up.
>
> Signed-off-by: Vivek Goyal <[email protected]>
> ---
> fs/fuse/virtio_fs.c | 4 ++++
> 1 file changed, 4 insertions(+)

Reviewed-by: Stefan Hajnoczi <[email protected]>

---

Attachments:

(No filename) (466.00 B)
signature.asc (499.00 B)
Download all attachments