[PATCH 2/3] virtiofs: Allow ENOMEM requests to wait and retry later in send_forget_request()

[Li Wang]

Allow ENOMEM requests to wait and retry later,
rather than dropping them.

Signed-off-by: Li Wang <liw...@kylinos.cn>
---
 fs/fuse/virtio_fs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index dec2c5a30e4e..bf043e698e0d 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -611,7 +611,7 @@ static void virtio_fs_request_dispatch_work(struct 
work_struct *work)
 }
 
 /*
- * Returns 1 if queue is full and sender should wait a bit before sending
+ * Returns 1 if queue or memory is full and sender should wait a bit before 
sending
  * next request, 0 otherwise.
  */
 static int send_forget_request(struct virtio_fs_vq *fsvq,
@@ -638,13 +638,13 @@ static int send_forget_request(struct virtio_fs_vq *fsvq,
 
        ret = virtqueue_add_outbuf(vq, &sg, 1, forget, GFP_ATOMIC);
        if (ret < 0) {
-               if (ret == -ENOSPC) {
+               if (ret == -ENOSPC || ret == -ENOMEM) {
                        pr_debug("virtio-fs: Could not queue FORGET: err=%d. 
Will try later\n",
                                 ret);
                        list_add_tail(&forget->list, &fsvq->queued_reqs);
                        if (!in_flight)
                                inc_in_flight_req(fsvq);
-                       /* Queue is full */
+                       /* Queue or memory is full */
                        ret = 1;
                } else {
                        pr_debug("virtio-fs: Could not queue FORGET: err=%d. 
Dropping it.\n",
-- 
2.34.1