Merge branch 'master' into gfs2

2 files changed, 2 insertions, 5 deletions

diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index 534f3eecc985..7e7a04be1278 100644
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -269,7 +269,6 @@ adfs_iget(struct super_block *sb, struct object_info *obj)
         inode->i_ino     = obj->file_id;
         inode->i_size    = obj->size;
         inode->i_nlink   = 2;
-        inode->i_blksize = PAGE_SIZE;
         inode->i_blocks  = (inode->i_size + sb->s_blocksize - 1) >>
                             sb->s_blocksize_bits;
 
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 82011019494c..9ade139086fc 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -251,8 +251,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(adfs_inode_cachep))
-                printk(KERN_INFO "adfs_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(adfs_inode_cachep);
 }
 
 static struct super_operations adfs_sops = {
@@ -339,11 +338,10 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
 
         sb->s_flags |= MS_NODIRATIME;
 
-        asb = kmalloc(sizeof(*asb), GFP_KERNEL);
+        asb = kzalloc(sizeof(*asb), GFP_KERNEL);
         if (!asb)
                 return -ENOMEM;
         sb->s_fs_info = asb;
-        memset(asb, 0, sizeof(*asb));
 
         /* set default options */
         asb->s_uid = 0;