Merge branch 'master' into gfs2

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 992ee0b87cc3..ec79e3091d1b 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -611,11 +611,10 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
         
         UFSD("ENTER\n");
                 
-        sbi = kmalloc(sizeof(struct ufs_sb_info), GFP_KERNEL);
+        sbi = kzalloc(sizeof(struct ufs_sb_info), GFP_KERNEL);
         if (!sbi)
                 goto failed_nomem;
         sb->s_fs_info = sbi;
-        memset(sbi, 0, sizeof(struct ufs_sb_info));
 
         UFSD("flag %u\n", (int)(sb->s_flags & MS_RDONLY));
         
@@ -1245,8 +1244,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(ufs_inode_cachep))
-                printk(KERN_INFO "ufs_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(ufs_inode_cachep);
 }
 
 #ifdef CONFIG_QUOTA