4 files changed, 4 insertions, 10 deletions

diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c
index 13231dd5ce66..0d200068d0af 100644
--- a/fs/hfs/bnode.c
+++ b/fs/hfs/bnode.c
@@ -249,10 +249,9 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
         sb = tree->inode->i_sb;
         size = sizeof(struct hfs_bnode) + tree->pages_per_bnode *
                 sizeof(struct page *);
-        node = kmalloc(size, GFP_KERNEL);
+        node = kzalloc(size, GFP_KERNEL);
         if (!node)
                 return NULL;
-        memset(node, 0, size);
         node->tree = tree;
         node->this = cnid;
         set_bit(HFS_BNODE_NEW, &node->flags);
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index 400357994319..5fd0ed71f923 100644
--- a/fs/hfs/btree.c
+++ b/fs/hfs/btree.c
@@ -21,10 +21,9 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
         struct page *page;
         unsigned int size;
 
-        tree = kmalloc(sizeof(*tree), GFP_KERNEL);
+        tree = kzalloc(sizeof(*tree), GFP_KERNEL);
         if (!tree)
                 return NULL;
-        memset(tree, 0, sizeof(*tree));
 
         init_MUTEX(&tree->tree_lock);
         spin_lock_init(&tree->hash_lock);
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 315cf44a90b2..d05641c35fc9 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -154,7 +154,6 @@ struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, int mode)
         inode->i_gid = current->fsgid;
         inode->i_nlink = 1;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-        inode->i_blksize = HFS_SB(sb)->alloc_blksz;
         HFS_I(inode)->flags = 0;
         HFS_I(inode)->rsrc_inode = NULL;
         HFS_I(inode)->fs_blocks = 0;
@@ -284,7 +283,6 @@ static int hfs_read_inode(struct inode *inode, void *data)
         inode->i_uid = hsb->s_uid;
         inode->i_gid = hsb->s_gid;
         inode->i_nlink = 1;
-        inode->i_blksize = HFS_SB(inode->i_sb)->alloc_blksz;
 
         if (idata->key)
                 HFS_I(inode)->cat_key = *idata->key;
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)