]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fuse: release: private_data cannot be NULL
authorMiklos Szeredi <mszeredi@redhat.com>
Wed, 22 Feb 2017 19:08:25 +0000 (20:08 +0100)
committerMiklos Szeredi <mszeredi@redhat.com>
Wed, 22 Feb 2017 19:08:25 +0000 (20:08 +0100)
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
fs/fuse/file.c

index a5f79c59fe1e51b3a3d8724393a54b5424c6b829..7069ea232049332464427465fdef96dd7410e91d 100644 (file)
@@ -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) {