[PATCH] ext4: open-code ext4_mb_update_group_info

[PATCH] ext4: open-code ext4_mb_update_group_info

[Eric Sandeen]

ext4_mb_update_group_info is only called in one place, and it's
extremely simple.  There's no reason to have it in a separate
function in a separate file as far as I can tell, it just
obfuscates what's really going on.

Perhaps it was intended to keep the grp->bb_* manipulation
local to mballoc.c but we're already accessing other grp->
fields in balloc.c directly so this seems ok.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

 balloc.c  |    2 +-
 ext4.h    |    2 --
 mballoc.c |    9 ---------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index e2126d7..1d04189 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -478,7 +478,7 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,
 	 * new bitmap information
 	 */
 	set_bit(EXT4_GROUP_INFO_NEED_INIT_BIT, &(grp->bb_state));
-	ext4_mb_update_group_info(grp, blocks_freed);
+	grp->bb_free += blocks_freed;
 	up_write(&grp->alloc_sem);
 
 	/* We dirtied the bitmap block */
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 9714db3..80cd0f7 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1340,8 +1340,6 @@ extern void ext4_mb_free_blocks(handle_t *, struct inode *,
 		ext4_fsblk_t, unsigned long, int, unsigned long *);
 extern int ext4_mb_add_groupinfo(struct super_block *sb,
 		ext4_group_t i, struct ext4_group_desc *desc);
-extern void ext4_mb_update_group_info(struct ext4_group_info *grp,
-		ext4_grpblk_t add);
 extern int ext4_mb_get_buddy_cache_lock(struct super_block *, ext4_group_t);
 extern void ext4_mb_put_buddy_cache_lock(struct super_block *,
 						ext4_group_t, int);
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index cd25846..2741b11 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2558,15 +2558,6 @@ exit_meta_group_info:
 	return -ENOMEM;
 } /* ext4_mb_add_groupinfo */
 
-/*
- * Update an existing group.
- * This function is used for online resize
- */
-void ext4_mb_update_group_info(struct ext4_group_info *grp, ext4_grpblk_t add)
-{
-	grp->bb_free += add;
-}

Re: [PATCH] ext4: open-code ext4_mb_update_group_info

[Theodore Tso]

Thanks, added to the ext4 patch queue

					- Ted