ext4: split out ext4_free_blocks_after_init()

The function ext4_free_blocks_after_init() used to be a #define of
ext4_init_block_bitmap().  This actually made it difficult to
understand how the function worked, and made it hard make changes to
support clusters.  So as an initial cleanup, I've separated out the
functionality of initializing block bitmap from calculating the number
of free blocks in the new block group.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 7 insertions, 13 deletions

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 9c63f273b550..b7a8130d0af4 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -816,7 +816,6 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode,
         int ret2, err = 0;
         struct inode *ret;
         ext4_group_t i;
-        int free = 0;
         static int once = 1;
         ext4_group_t flex_group;
 
@@ -950,26 +949,21 @@ got:
                         goto fail;
                 }
 
-                free = 0;
-                ext4_lock_group(sb, group);
+                BUFFER_TRACE(block_bitmap_bh, "dirty block bitmap");
+                err = ext4_handle_dirty_metadata(handle, NULL, block_bitmap_bh);
+                brelse(block_bitmap_bh);
+
                 /* recheck and clear flag under lock if we still need to */
+                ext4_lock_group(sb, group);
                 if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
-                        free = ext4_free_blocks_after_init(sb, group, gdp);
                         gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
-                        ext4_free_blks_set(sb, gdp, free);
+                        ext4_free_blks_set(sb, gdp,
+                                ext4_free_blocks_after_init(sb, group, gdp));
                         gdp->bg_checksum = ext4_group_desc_csum(sbi, group,
                                                                 gdp);
                 }
                 ext4_unlock_group(sb, group);
 
-                /* Don't need to dirty bitmap block if we didn't change it */
-                if (free) {
-                        BUFFER_TRACE(block_bitmap_bh, "dirty block bitmap");
-                        err = ext4_handle_dirty_metadata(handle,
-                                                        NULL, block_bitmap_bh);
-                }
-
-                brelse(block_bitmap_bh);
                 if (err)
                         goto fail;
         }