Commit 0529155e authored by Yongqiang Yang's avatar Yongqiang Yang Committed by Theodore Ts'o
Browse files

ext4: rename ext4_add_groupblocks() to ext4_group_add_blocks() 



Signed-off-by: default avatarYongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent ce723c31

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ extern void ext4_free_blocks(handle_t *handle, struct inode *inode, 
			     unsigned long count, int flags);

extern int ext4_mb_add_groupinfo(struct super_block *sb,

		ext4_group_t i, struct ext4_group_desc *desc);

extern void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,

extern void ext4_group_add_blocks(handle_t *handle, struct super_block *sb,

				ext4_fsblk_t block, unsigned long count);

extern int ext4_trim_fs(struct super_block *, struct fstrim_range *);

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -4667,7 +4667,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, 
}



/**

 * ext4_add_groupblocks() -- Add given blocks to an existing group

 * ext4_group_add_blocks() -- Add given blocks to an existing group

 * @handle:			handle to this transaction

 * @sb:				super block

 * @block:			start physcial block to add to the block group
@@ -4675,7 +4675,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, 
 *

 * This marks the blocks as free in the bitmap and buddy.

 */

void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,

void ext4_group_add_blocks(handle_t *handle, struct super_block *sb,

			 ext4_fsblk_t block, unsigned long count)

{

	struct buffer_head *bitmap_bh = NULL;

fs/ext4/resize.c

+1 −1
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, 
	ext4_debug("freeing blocks %llu through %llu\n", o_blocks_count,

		   o_blocks_count + add);

	/* We add the blocks to the bitmap and set the group need init bit */

	ext4_add_groupblocks(handle, sb, o_blocks_count, add);

	ext4_group_add_blocks(handle, sb, o_blocks_count, add);

	ext4_handle_dirty_super(handle, sb);

	ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,

		   o_blocks_count + add);