5 files changed, 24 insertions, 23 deletions

diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index da52b4a5db64..7c420b800c34 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -89,8 +89,8 @@ ext2_acl_to_disk(const struct posix_acl *acl, size_t *size)
         size_t n;
 
         *size = ext2_acl_size(acl->a_count);
-        ext_acl = (ext2_acl_header *)kmalloc(sizeof(ext2_acl_header) +
-                acl->a_count * sizeof(ext2_acl_entry), GFP_KERNEL);
+        ext_acl = kmalloc(sizeof(ext2_acl_header) + acl->a_count *
+                        sizeof(ext2_acl_entry), GFP_KERNEL);
         if (!ext_acl)
                 return ERR_PTR(-ENOMEM);
         ext_acl->a_version = cpu_to_le32(EXT2_ACL_VERSION);
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 695f69ccf908..2cb545bf0f3c 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -574,7 +574,6 @@ got:
         inode->i_mode = mode;
 
         inode->i_ino = ino;
-        inode->i_blksize = PAGE_SIZE;   /* This is the optimal IO size (for stat), not the fs block size */
         inode->i_blocks = 0;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
         memset(ei->i_data, 0, sizeof(ei->i_data));
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index fb4d3220eb8d..dd4e14c221e0 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1094,7 +1094,6 @@ void ext2_read_inode (struct inode * inode)
                 brelse (bh);
                 goto bad_inode;
         }
-        inode->i_blksize = PAGE_SIZE;   /* This is the optimal IO size (for stat), not the fs block size */
         inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
         ei->i_flags = le32_to_cpu(raw_inode->i_flags);
         ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 4286ff6330b6..513cd421ac0b 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -184,8 +184,7 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(ext2_inode_cachep))
-                printk(KERN_INFO "ext2_inode_cache: not all structures were freed\n");
+        kmem_cache_destroy(ext2_inode_cachep);
 }
 
 static void ext2_clear_inode(struct inode *inode)
@@ -544,17 +543,24 @@ static int ext2_check_descriptors (struct super_block * sb)
         int i;
         int desc_block = 0;
         struct ext2_sb_info *sbi = EXT2_SB(sb);
-        unsigned long block = le32_to_cpu(sbi->s_es->s_first_data_block);
+        unsigned long first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
+        unsigned long last_block;
         struct ext2_group_desc * gdp = NULL;
 
         ext2_debug ("Checking group descriptors");
 
         for (i = 0; i < sbi->s_groups_count; i++)
         {
+                if (i == sbi->s_groups_count - 1)
+                        last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1;
+                else
+                        last_block = first_block +
+                                (EXT2_BLOCKS_PER_GROUP(sb) - 1);
+
                 if ((i % EXT2_DESC_PER_BLOCK(sb)) == 0)
                         gdp = (struct ext2_group_desc *) sbi->s_group_desc[desc_block++]->b_data;
-                if (le32_to_cpu(gdp->bg_block_bitmap) < block ||
-                    le32_to_cpu(gdp->bg_block_bitmap) >= block + EXT2_BLOCKS_PER_GROUP(sb))
+                if (le32_to_cpu(gdp->bg_block_bitmap) < first_block ||
+                    le32_to_cpu(gdp->bg_block_bitmap) > last_block)
                 {
                         ext2_error (sb, "ext2_check_descriptors",
                                     "Block bitmap for group %d"
@@ -562,8 +568,8 @@ static int ext2_check_descriptors (struct super_block * sb)
                                     i, (unsigned long) le32_to_cpu(gdp->bg_block_bitmap));
                         return 0;
                 }
-                if (le32_to_cpu(gdp->bg_inode_bitmap) < block ||
-                    le32_to_cpu(gdp->bg_inode_bitmap) >= block + EXT2_BLOCKS_PER_GROUP(sb))
+                if (le32_to_cpu(gdp->bg_inode_bitmap) < first_block ||
+                    le32_to_cpu(gdp->bg_inode_bitmap) > last_block)
                 {
                         ext2_error (sb, "ext2_check_descriptors",
                                     "Inode bitmap for group %d"
@@ -571,9 +577,9 @@ static int ext2_check_descriptors (struct super_block * sb)
                                     i, (unsigned long) le32_to_cpu(gdp->bg_inode_bitmap));
                         return 0;
                 }
-                if (le32_to_cpu(gdp->bg_inode_table) < block ||
-                    le32_to_cpu(gdp->bg_inode_table) + sbi->s_itb_per_group >=
-                    block + EXT2_BLOCKS_PER_GROUP(sb))
+                if (le32_to_cpu(gdp->bg_inode_table) < first_block ||
+                    le32_to_cpu(gdp->bg_inode_table) + sbi->s_itb_per_group >
+                    last_block)
                 {
                         ext2_error (sb, "ext2_check_descriptors",
                                     "Inode table for group %d"
@@ -581,7 +587,7 @@ static int ext2_check_descriptors (struct super_block * sb)
                                     i, (unsigned long) le32_to_cpu(gdp->bg_inode_table));
                         return 0;
                 }
-                block += EXT2_BLOCKS_PER_GROUP(sb);
+                first_block += EXT2_BLOCKS_PER_GROUP(sb);
                 gdp++;
         }
         return 1;
@@ -648,11 +654,10 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         int i, j;
         __le32 features;
 
-        sbi = kmalloc(sizeof(*sbi), GFP_KERNEL);
+        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
         if (!sbi)
                 return -ENOMEM;
         sb->s_fs_info = sbi;
-        memset(sbi, 0, sizeof(*sbi));
 
         /*
          * See what the current blocksize for the device is, and
@@ -861,10 +866,9 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
 
         if (EXT2_BLOCKS_PER_GROUP(sb) == 0)
                 goto cantfind_ext2;
-        sbi->s_groups_count = (le32_to_cpu(es->s_blocks_count) -
-                                        le32_to_cpu(es->s_first_data_block) +
-                                       EXT2_BLOCKS_PER_GROUP(sb) - 1) /
-                                       EXT2_BLOCKS_PER_GROUP(sb);
+        sbi->s_groups_count = ((le32_to_cpu(es->s_blocks_count) -
+                                le32_to_cpu(es->s_first_data_block) - 1)
+                                        / EXT2_BLOCKS_PER_GROUP(sb)) + 1;
         db_count = (sbi->s_groups_count + EXT2_DESC_PER_BLOCK(sb) - 1) /
                    EXT2_DESC_PER_BLOCK(sb);
         sbi->s_group_desc = kmalloc (db_count * sizeof (struct buffer_head *), GFP_KERNEL);
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 86ae8e93adb9..af52a7f8b291 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -521,11 +521,10 @@ bad_block:		ext2_error(sb, "ext2_xattr_set",
                 }
         } else {
                 /* Allocate a buffer where we construct the new block. */
-                header = kmalloc(sb->s_blocksize, GFP_KERNEL);
+                header = kzalloc(sb->s_blocksize, GFP_KERNEL);
                 error = -ENOMEM;
                 if (header == NULL)
                         goto cleanup;
-                memset(header, 0, sb->s_blocksize);
                 end = (char *)header + sb->s_blocksize;
                 header->h_magic = cpu_to_le32(EXT2_XATTR_MAGIC);
                 header->h_blocks = header->h_refcount = cpu_to_le32(1);