]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fuse: add missing FR_FORCE
authorMiklos Szeredi <mszeredi@redhat.com>
Wed, 22 Feb 2017 19:08:25 +0000 (20:08 +0100)
committerJiri Slaby <jslaby@suse.cz>
Mon, 13 Mar 2017 20:40:33 +0000 (21:40 +0100)
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.

[js] force is a variable, not a bit

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 5a18ec176c93 ("fuse: fix hang of single threaded fuseblk filesystem")
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
fs/fuse/file.c

index f6314cd3e3b0add050cf095596ce78a265fb8013..75dee32d41b527e69bc39ea565e1e759db4204a0 100644 (file)
@@ -128,6 +128,7 @@ static void fuse_file_put(struct fuse_file *ff, bool sync)
                struct fuse_req *req = ff->reserved_req;
 
                if (sync) {
+                       req->force = 1;
                        req->background = 0;
                        fuse_request_send(ff->fc, req);
                        path_put(&req->misc.release.path);