summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2017-02-22 20:08:25 +0100
committerBen Hutchings <ben@decadent.org.uk>2017-06-05 21:17:13 +0100
commit7b5736f6b0378cc8ec9ec5888153300112a5b057 (patch)
tree83280ebd8d9f85762b5f65a100227005ff09fe6b /fs
parent5da99487e97c80c5dfc9f98d372f9ba72d094f25 (diff)
downloadlinux-stable-7b5736f6b0378cc8ec9ec5888153300112a5b057.tar.gz
linux-stable-7b5736f6b0378cc8ec9ec5888153300112a5b057.tar.bz2
linux-stable-7b5736f6b0378cc8ec9ec5888153300112a5b057.zip
fuse: add missing FR_FORCE
commit 2e38bea99a80eab408adee27f873a188d57b76cb upstream. fuse_file_put() was missing the "force" flag for the RELEASE request when sending synchronously (fuseblk). If this flag is not set, then a sync request may be interrupted before it is dequeued by the userspace filesystem. In this case the OPEN won't be balanced with a RELEASE. Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> Fixes: 5a18ec176c93 ("fuse: fix hang of single threaded fuseblk filesystem") [bwh: Backported to 3.16: - "force" flag is a bitfield - Adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 4e9cfbc453c7..d583c976fff2 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -136,6 +136,7 @@ static void fuse_file_put(struct fuse_file *ff, bool sync)
path_put(&req->misc.release.path);
fuse_put_request(ff->fc, req);
} else if (sync) {
+ req->force = 1;
req->background = 0;
fuse_request_send(ff->fc, req);
path_put(&req->misc.release.path);