diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2017-02-22 14:08:25 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 00:41:47 -0500 |
commit | 1e6be9c19c1286cdc3e87a27b06038361a0165ab (patch) | |
tree | c711792c27df5aa39ee36222d023fdf00ee04017 /fs | |
parent | abf74467e7fb19c957eb284798fc41cc8059dc41 (diff) |
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")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fuse/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 2401c5dabb2a..5ec5870e423a 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -100,6 +100,7 @@ static void fuse_file_put(struct fuse_file *ff, bool sync) | |||
100 | iput(req->misc.release.inode); | 100 | iput(req->misc.release.inode); |
101 | fuse_put_request(ff->fc, req); | 101 | fuse_put_request(ff->fc, req); |
102 | } else if (sync) { | 102 | } else if (sync) { |
103 | __set_bit(FR_FORCE, &req->flags); | ||
103 | __clear_bit(FR_BACKGROUND, &req->flags); | 104 | __clear_bit(FR_BACKGROUND, &req->flags); |
104 | fuse_request_send(ff->fc, req); | 105 | fuse_request_send(ff->fc, req); |
105 | iput(req->misc.release.inode); | 106 | iput(req->misc.release.inode); |