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

Commit 7e5a8cdd authored by Shen Feng's avatar Shen Feng Committed by Theodore Ts'o
Browse files

ext4: fix error processing in mb_free_blocks 



The error processing of the return value of mb_free_blocks is meanless
because it only returns 0.  This fix includes

- make mb_free_blocks return void

- remove the error processing part in callers

- unlock group before calling ext4_error in mb_free_blocks

Signed-off-by: default avatarShen Feng <shen@cn.fujitsu.com>
Cc: Mingming Cao <cmm@us.ibm.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent cfbe7e4f

fs/ext4/mballoc.c

+5 −8
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static void mb_set_bits(spinlock_t *lock, void *bm, int cur, int len) 
	}

}



static int mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,

static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,

			  int first, int count)

{

	int block = 0;
@@ -1091,11 +1091,12 @@ static int mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, 
			blocknr += block;

			blocknr +=

			    le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block);



			ext4_unlock_group(sb, e4b->bd_group);

			ext4_error(sb, __func__, "double-free of inode"

				   " %lu's block %llu(bit %u in group %lu)\n",

				   inode ? inode->i_ino : 0, blocknr, block,

				   e4b->bd_group);

			ext4_lock_group(sb, e4b->bd_group);

		}

		mb_clear_bit(block, EXT4_MB_BITMAP(e4b));

		e4b->bd_info->bb_counters[order]++;
@@ -1133,8 +1134,6 @@ static int mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, 
		} while (1);

	}

	mb_check_buddy(e4b);



	return 0;

}



static int mb_find_extent(struct ext4_buddy *e4b, int order, int block,
@@ -2570,8 +2569,7 @@ ext4_mb_free_committed_blocks(struct super_block *sb) 
		ext4_lock_group(sb, md->group);

		for (i = 0; i < md->num; i++) {

			mb_debug(" %u", md->blocks[i]);

			err = mb_free_blocks(NULL, &e4b, md->blocks[i], 1);

			BUG_ON(err != 0);

			mb_free_blocks(NULL, &e4b, md->blocks[i], 1);

		}

		mb_debug("\n");

		ext4_unlock_group(sb, md->group);
@@ -4333,10 +4331,9 @@ void ext4_mb_free_blocks(handle_t *handle, struct inode *inode, 
		ext4_mb_free_metadata(handle, &e4b, block_group, bit, count);

	} else {

		ext4_lock_group(sb, block_group);

		err = mb_free_blocks(inode, &e4b, bit, count);

		mb_free_blocks(inode, &e4b, bit, count);

		ext4_mb_return_to_preallocation(inode, &e4b, block, count);

		ext4_unlock_group(sb, block_group);

		BUG_ON(err != 0);

	}



	spin_lock(sb_bgl_lock(sbi, block_group));