1 files changed, 10 insertions, 5 deletions

diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 223c0431042d..a624c3ec8189 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -73,7 +73,6 @@ static int cramfs_iget5_set(struct inode *inode, void *opaque)
         inode->i_uid = cramfs_inode->uid;
         inode->i_size = cramfs_inode->size;
         inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1;
-        inode->i_blksize = PAGE_CACHE_SIZE;
         inode->i_gid = cramfs_inode->gid;
         /* Struct copy intentional */
         inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime;
@@ -242,11 +241,10 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
 
         sb->s_flags |= MS_RDONLY;
 
-        sbi = kmalloc(sizeof(struct cramfs_sb_info), GFP_KERNEL);
+        sbi = kzalloc(sizeof(struct cramfs_sb_info), GFP_KERNEL);
         if (!sbi)
                 return -ENOMEM;
         sb->s_fs_info = sbi;
-        memset(sbi, 0, sizeof(struct cramfs_sb_info));
 
         /* Invalidate the read buffers on mount: think disk change.. */
         mutex_lock(&read_mutex);
@@ -545,8 +543,15 @@ static struct file_system_type cramfs_fs_type = {
 
 static int __init init_cramfs_fs(void)
 {
-        cramfs_uncompress_init();
-        return register_filesystem(&cramfs_fs_type);
+        int rv;
+
+        rv = cramfs_uncompress_init();
+        if (rv < 0)
+                return rv;
+        rv = register_filesystem(&cramfs_fs_type);
+        if (rv < 0)
+                cramfs_uncompress_exit();
+        return rv;
 }
 
 static void __exit exit_cramfs_fs(void)