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

ext4: let ext4_group_add_blocks() return an error code 



This patch lets ext4_group_add_blocks() return an error code if it
fails, so that upper functions can handle error correctly.

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

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_group_add_blocks(handle_t *handle, struct super_block *sb,

extern int 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

+15 −5
Original line number Diff line number Diff line
@@ -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_group_add_blocks(handle_t *handle, struct super_block *sb,

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

			 ext4_fsblk_t block, unsigned long count)

{

	struct buffer_head *bitmap_bh = NULL;
@@ -4696,15 +4696,24 @@ void ext4_group_add_blocks(handle_t *handle, struct super_block *sb, 
	 * Check to see if we are freeing blocks across a group

	 * boundary.

	 */

	if (bit + count > EXT4_BLOCKS_PER_GROUP(sb))

	if (bit + count > EXT4_BLOCKS_PER_GROUP(sb)) {

		ext4_warning(sb, "too much blocks added to group %u\n",

			     block_group);

		err = -EINVAL;

		goto error_return;

	}



	bitmap_bh = ext4_read_block_bitmap(sb, block_group);

	if (!bitmap_bh)

	if (!bitmap_bh) {

		err = -EIO;

		goto error_return;

	}



	desc = ext4_get_group_desc(sb, block_group, &gd_bh);

	if (!desc)

	if (!desc) {

		err = -EIO;

		goto error_return;

	}



	if (in_range(ext4_block_bitmap(sb, desc), block, count) ||

	    in_range(ext4_inode_bitmap(sb, desc), block, count) ||
@@ -4714,6 +4723,7 @@ void ext4_group_add_blocks(handle_t *handle, struct super_block *sb, 
		ext4_error(sb, "Adding blocks in system zones - "

			   "Block = %llu, count = %lu",

			   block, count);

		err = -EINVAL;

		goto error_return;

	}
@@ -4782,7 +4792,7 @@ void ext4_group_add_blocks(handle_t *handle, struct super_block *sb, 
error_return:

	brelse(bitmap_bh);

	ext4_std_error(sb, err);

	return;

	return err;

}



/**

fs/ext4/resize.c

+7 −3
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es, 
	ext4_grpblk_t add;

	struct buffer_head *bh;

	handle_t *handle;

	int err;

	int err, err2;

	ext4_group_t group;



	o_blocks_count = ext4_blocks_count(es);
@@ -1056,11 +1056,15 @@ 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_group_add_blocks(handle, sb, o_blocks_count, add);

	err = 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);

	if ((err = ext4_journal_stop(handle)))

	err2 = ext4_journal_stop(handle);

	if (!err && err2)

		err = err2;



	if (err)

		goto exit_put;



	if (test_opt(sb, DEBUG))