1 files changed, 17 insertions, 13 deletions

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 99ab428bcfa0..1cd6994fc446 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -788,7 +788,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore)
         int first_block;
         struct super_block *sb;
         struct buffer_head *bhs;
-        struct buffer_head **bh;
+        struct buffer_head **bh = NULL;
         struct inode *inode;
         char *data;
         char *bitmap;
@@ -2375,7 +2375,7 @@ static int ext4_groupinfo_create_slab(size_t size)
         return 0;
 }
 
-int ext4_mb_init(struct super_block *sb, int needs_recovery)
+int ext4_mb_init(struct super_block *sb)
 {
         struct ext4_sb_info *sbi = EXT4_SB(sb);
         unsigned i, j;
@@ -2517,6 +2517,9 @@ int ext4_mb_release(struct super_block *sb)
         struct ext4_sb_info *sbi = EXT4_SB(sb);
         struct kmem_cache *cachep = get_groupinfo_cache(sb->s_blocksize_bits);
 
+        if (sbi->s_proc)
+                remove_proc_entry("mb_groups", sbi->s_proc);
+
         if (sbi->s_group_info) {
                 for (i = 0; i < ngroups; i++) {
                         grinfo = ext4_get_group_info(sb, i);
@@ -2564,8 +2567,6 @@ int ext4_mb_release(struct super_block *sb)
         }
 
         free_percpu(sbi->s_locality_groups);
-        if (sbi->s_proc)
-                remove_proc_entry("mb_groups", sbi->s_proc);
 
         return 0;
 }
@@ -2797,7 +2798,9 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,
         }
         len = ext4_free_group_clusters(sb, gdp) - ac->ac_b_ex.fe_len;
         ext4_free_group_clusters_set(sb, gdp, len);
-        gdp->bg_checksum = ext4_group_desc_csum(sbi, ac->ac_b_ex.fe_group, gdp);
+        ext4_block_bitmap_csum_set(sb, ac->ac_b_ex.fe_group, gdp, bitmap_bh,
+                                   EXT4_BLOCKS_PER_GROUP(sb) / 8);
+        ext4_group_desc_csum_set(sb, ac->ac_b_ex.fe_group, gdp);
 
         ext4_unlock_group(sb, ac->ac_b_ex.fe_group);
         percpu_counter_sub(&sbi->s_freeclusters_counter, ac->ac_b_ex.fe_len);
@@ -3071,13 +3074,9 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
 static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac)
 {
         struct ext4_prealloc_space *pa = ac->ac_pa;
-        int len;
-
-        if (pa && pa->pa_type == MB_INODE_PA) {
-                len = ac->ac_b_ex.fe_len;
-                pa->pa_free += len;
-        }
 
+        if (pa && pa->pa_type == MB_INODE_PA)
+                pa->pa_free += ac->ac_b_ex.fe_len;
 }
 
 /*
@@ -4636,6 +4635,7 @@ do_more:
                  */
                 new_entry = kmem_cache_alloc(ext4_free_data_cachep, GFP_NOFS);
                 if (!new_entry) {
+                        ext4_mb_unload_buddy(&e4b);
                         err = -ENOMEM;
                         goto error_return;
                 }
@@ -4659,7 +4659,9 @@ do_more:
 
         ret = ext4_free_group_clusters(sb, gdp) + count_clusters;
         ext4_free_group_clusters_set(sb, gdp, ret);
-        gdp->bg_checksum = ext4_group_desc_csum(sbi, block_group, gdp);
+        ext4_block_bitmap_csum_set(sb, block_group, gdp, bitmap_bh,
+                                   EXT4_BLOCKS_PER_GROUP(sb) / 8);
+        ext4_group_desc_csum_set(sb, block_group, gdp);
         ext4_unlock_group(sb, block_group);
         percpu_counter_add(&sbi->s_freeclusters_counter, count_clusters);
 
@@ -4803,7 +4805,9 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
         mb_free_blocks(NULL, &e4b, bit, count);
         blk_free_count = blocks_freed + ext4_free_group_clusters(sb, desc);
         ext4_free_group_clusters_set(sb, desc, blk_free_count);
-        desc->bg_checksum = ext4_group_desc_csum(sbi, block_group, desc);
+        ext4_block_bitmap_csum_set(sb, block_group, desc, bitmap_bh,
+                                   EXT4_BLOCKS_PER_GROUP(sb) / 8);
+        ext4_group_desc_csum_set(sb, block_group, desc);
         ext4_unlock_group(sb, block_group);
         percpu_counter_add(&sbi->s_freeclusters_counter,
                            EXT4_B2C(sbi, blocks_freed));