summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2017-02-22 20:08:25 +0100
committerMiklos Szeredi <mszeredi@redhat.com>2017-02-22 20:08:25 +0100
commit9a87ad3da905239413477ac0698734afc5cc30bd (patch)
tree0aaf470e51e726f5000468ab9fdb0fea0c044f4e /fs
parent267d84449f52349ee252db684ed95ede18e51744 (diff)
downloadlinux-stable-9a87ad3da905239413477ac0698734afc5cc30bd.tar.gz
linux-stable-9a87ad3da905239413477ac0698734afc5cc30bd.tar.bz2
linux-stable-9a87ad3da905239413477ac0698734afc5cc30bd.zip
fuse: release: private_data cannot be NULL
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/file.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index a5f79c59fe1e..7069ea232049 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -246,14 +246,9 @@ static void fuse_prepare_release(struct fuse_file *ff, int flags, int opcode)
void fuse_release_common(struct file *file, int opcode)
{
- struct fuse_file *ff;
- struct fuse_req *req;
-
- ff = file->private_data;
- if (unlikely(!ff))
- return;
+ struct fuse_file *ff = file->private_data;
+ struct fuse_req *req = ff->reserved_req;
- req = ff->reserved_req;
fuse_prepare_release(ff, file->f_flags, opcode);
if (ff->flock) {