Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0373130d authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

ext4: open-code ext4_mb_update_group_info 



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: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent bf43d84b

fs/ext4/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

fs/ext4/ext4.h

+0 −2
Original line number Diff line number Diff line
@@ -1343,8 +1343,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);

fs/ext4/mballoc.c

+0 −9
Original line number Diff line number Diff line
@@ -2554,15 +2554,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;

}



static int ext4_mb_init_backend(struct super_block *sb)

{

	ext4_group_t ngroups = ext4_get_groups_count(sb);