From: Miklos Szeredi <mszeredi@redhat.com>
Date: Tue, 24 Sep 2024 08:47:23 +0000 (+0200)
Subject: fuse: clear FR_PENDING if abort is detected when sending request
X-Git-Tag: v6.12-rc1~57^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcd2d9e1fdcd7cada612f2e8737fb13a2bce7d0e;p=thirdparty%2Fkernel%2Flinux.git

fuse: clear FR_PENDING if abort is detected when sending request

The (!fiq->connected) check was moved into the queuing method resulting in
the following:

Fixes: 5de8acb41c86 ("fuse: cleanup request queuing towards virtiofs")
Reported-by: Lai, Yi <yi1.lai@linux.intel.com>
Closes: https://lore.kernel.org/all/ZvFEAM6JfrBKsOU0@ly-workstation/
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index cdf925e0b317b..53c4569d85a40 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -295,6 +295,7 @@ static void fuse_dev_queue_req(struct fuse_iqueue *fiq, struct fuse_req *req)
 	} else {
 		spin_unlock(&fiq->lock);
 		req->out.h.error = -ENOTCONN;
+		clear_bit(FR_PENDING, &req->flags);
 		fuse_request_end(req);
 	}
 }