summaryrefslogtreecommitdiff
path: root/fs/fuse/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-03 23:14:13 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-03 23:14:13 +0300
commit4e66c42c60fdf9be81837857454a41b39bf1b773 (patch)
tree3b0b20b999a18ff3752969c85a6bb8dd43424628 /fs/fuse/dir.c
parente58bc927835a6f5ddbe4d2e069c9082b706810e7 (diff)
parent9a87ad3da905239413477ac0698734afc5cc30bd (diff)
downloadlinux-4e66c42c60fdf9be81837857454a41b39bf1b773.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse update from Miklos Szeredi: "A bugfix and cleanups" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: release: private_data cannot be NULL fuse: cleanup fuse_file refcounting fuse: add missing FR_FORCE
Diffstat (limited to 'fs/fuse/dir.c')
-rw-r--r--fs/fuse/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index beb3d64f16e2..00800c07ba1c 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -473,7 +473,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
if (err) {
fuse_sync_release(ff, flags);
} else {
- file->private_data = fuse_file_get(ff);
+ file->private_data = ff;
fuse_finish_open(inode, file);
}
return err;