Merge tag 'v3.10.85' into update

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

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 4d371f3b9a4536f48b09a10544b24b0c18531924..9bc50c30afc4b0a24fdf3f77cb2583e95e33d52e 100644 (file)
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -7,7 +7,7 @@
 */
 
 #include "fuse_i.h"
-
+#include "fuse.h"
 #include <linux/pagemap.h>
 #include <linux/slab.h>
 #include <linux/file.h>
@@ -1298,7 +1298,7 @@ static int __init fuse_init(void)
 
        sanitize_global_limit(&max_user_bgreq);
        sanitize_global_limit(&max_user_congthresh);
-
+       fuse_iolog_init();
        return 0;
 
  err_sysfs_cleanup:
@@ -1319,6 +1319,7 @@ static void __exit fuse_exit(void)
        fuse_sysfs_cleanup();
        fuse_fs_cleanup();
        fuse_dev_cleanup();
+       fuse_iolog_exit();
 }
 
 module_init(fuse_init);