diff options
| author | Linus Torvalds | 2009-01-26 18:49:22 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-01-26 18:49:22 +0100 |
| commit | 2d07d4d1bba3b141941682fa36cacbe12bbb143b (patch) | |
| tree | 7f64f9870c60382e3df33ba795098b5142c9d7d1 /fs/fuse/file.c | |
| parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | fuse: fix poll notify (diff) | |
| download | kernel-qcow2-linux-2d07d4d1bba3b141941682fa36cacbe12bbb143b.tar.gz kernel-qcow2-linux-2d07d4d1bba3b141941682fa36cacbe12bbb143b.tar.xz kernel-qcow2-linux-2d07d4d1bba3b141941682fa36cacbe12bbb143b.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix poll notify
fuse: destroy bdi on umount
fuse: fuse_fill_super error handling cleanup
fuse: fix missing fput on error
fuse: fix NULL deref in fuse_file_alloc()
Diffstat (limited to 'fs/fuse/file.c')
| -rw-r--r-- | fs/fuse/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index e8162646a9b5..d9fdb7cec538 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -54,7 +54,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc) ff->reserved_req = fuse_request_alloc(); if (!ff->reserved_req) { kfree(ff); - ff = NULL; + return NULL; } else { INIT_LIST_HEAD(&ff->write_entry); atomic_set(&ff->count, 0); |