Merge branch 'master' into gfs2

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 34937ee83ab1..d43b4fcc8ad3 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -356,11 +356,10 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
         struct inode *root_inode;
         int res;
 
-        sbi = kmalloc(sizeof(struct hfs_sb_info), GFP_KERNEL);
+        sbi = kzalloc(sizeof(struct hfs_sb_info), GFP_KERNEL);
         if (!sbi)
                 return -ENOMEM;
         sb->s_fs_info = sbi;
-        memset(sbi, 0, sizeof(struct hfs_sb_info));
         INIT_HLIST_HEAD(&sbi->rsrc_inodes);
 
         res = -EINVAL;
@@ -455,8 +454,7 @@ static int __init init_hfs_fs(void)
 static void __exit exit_hfs_fs(void)
 {
         unregister_filesystem(&hfs_fs_type);
-        if (kmem_cache_destroy(hfs_inode_cachep))
-                printk(KERN_ERR "hfs_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(hfs_inode_cachep);
 }
 
 module_init(init_hfs_fs)