From: Miklos Szeredi <mszeredi@redhat.com>
Date: Wed, 22 Feb 2017 19:08:25 +0000 (+0100)
Subject: fuse: release: private_data cannot be NULL
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a87ad3da905239413477ac0698734afc5cc30bd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

fuse: release: private_data cannot be NULL

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

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) {