Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / fuse / file.c

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 1e966ad62231e9943dd9dbc6ba9ec36b744f2649..fa4b741ad4eddf13e0f45ee6a6af988873606b22 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -369,7 +369,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc)
 {
        struct fuse_file *ff;
 
 {
        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;
 
        if (unlikely(!ff))
                return NULL;