diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 10:56:43 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 10:56:43 +1000 |
commit | 1dcc1c8bd611889095ead0e1cf14c3dfc86a4758 (patch) | |
tree | 453f5e3fcc2ddfa292e83316c2f941042aec06ac /fs | |
parent | 13f7c77ae2d51a4625e41542cfa1f5c88594498d (diff) | |
parent | 68227c03cba84a24faf8a7277d2b1a03c8959c2c (diff) |
Merge remote-tracking branch 'fuse/for-next'
Diffstat (limited to 'fs')
-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 3ee4fdc3da9e..76eac2a554c4 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -46,7 +46,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc) { struct fuse_file *ff; - ff = kmalloc(sizeof(struct fuse_file), GFP_KERNEL); + ff = kzalloc(sizeof(struct fuse_file), GFP_KERNEL); if (unlikely(!ff)) return NULL; |