Merge branch 'master' into gfs2

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/efs/super.c b/fs/efs/super.c
index 8ac2462ae5dd..b3f50651eb6b 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -90,8 +90,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(efs_inode_cachep))
-                printk(KERN_INFO "efs_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(efs_inode_cachep);
 }
 
 static void efs_put_super(struct super_block *s)
@@ -248,11 +247,10 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
         struct buffer_head *bh;
         struct inode *root;
 
-        sb = kmalloc(sizeof(struct efs_sb_info), GFP_KERNEL);
+        sb = kzalloc(sizeof(struct efs_sb_info), GFP_KERNEL);
         if (!sb)
                 return -ENOMEM;
         s->s_fs_info = sb;
-        memset(sb, 0, sizeof(struct efs_sb_info));
  
         s->s_magic              = EFS_SUPER_MAGIC;
         if (!sb_set_blocksize(s, EFS_BLOCKSIZE)) {