diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 21:14:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-03 21:14:13 +0100 |
| commit | 4e66c42c60fdf9be81837857454a41b39bf1b773 (patch) | |
| tree | 3b0b20b999a18ff3752969c85a6bb8dd43424628 /fs/fuse/dir.c | |
| parent | Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | fuse: release: private_data cannot be NULL (diff) | |
| download | linux-4e66c42c60fdf9be81837857454a41b39bf1b773.tar.xz linux-4e66c42c60fdf9be81837857454a41b39bf1b773.zip | |
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.c | 2 |
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; |