2019-10-22 07:15:26

by Chengguang Xu

Subject: [PATCH] ext2: add missing brelse in ext2_new_blocks()

There is a missing brelse of bitmap_bh in the
case of retry.

Signed-off-by: Chengguang Xu <[email protected]>
---
fs/ext2/balloc.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 924c1c765306..e8eedad479a7 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -1313,6 +1313,7 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal,
if (free_blocks > 0) {
grp_target_blk = ((goal - le32_to_cpu(es->s_first_data_block)) %
EXT2_BLOCKS_PER_GROUP(sb));
+ brelse(bitmap_bh);
bitmap_bh = read_block_bitmap(sb, group_no);
if (!bitmap_bh)
goto io_error;
--
2.20.1

2019-10-22 08:32:10

by Jan Kara

Subject: Re: [PATCH] ext2: add missing brelse in ext2_new_blocks()

On Tue 22-10-19 15:10:45, Chengguang Xu wrote:
> There is a missing brelse of bitmap_bh in the
> case of retry.
>
> Signed-off-by: Chengguang Xu <[email protected]>

Good catch but please add a comment explaining that 'bitmap_bh' may be
non-null because of retry. Thanks!

Honza

> ---
> fs/ext2/balloc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
> index 924c1c765306..e8eedad479a7 100644
> --- a/fs/ext2/balloc.c
> +++ b/fs/ext2/balloc.c
> @@ -1313,6 +1313,7 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal,
> if (free_blocks > 0) {
> grp_target_blk = ((goal - le32_to_cpu(es->s_first_data_block)) %
> EXT2_BLOCKS_PER_GROUP(sb));
> + brelse(bitmap_bh);
> bitmap_bh = read_block_bitmap(sb, group_no);
> if (!bitmap_bh)
> goto io_error;
> --
> 2.20.1
>
>
>
--
Jan Kara <[email protected]>
SUSE Labs, CR