Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Chengguang Xu <cgxu519@mykernel.net>
To:     jack@suse.com
Cc:     linux-ext4@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20191022091738.9160-1-cgxu519@mykernel.net>
Subject: [PATCH v2] ext2: add missing brelse in ext2_new_blocks()
Date:   Tue, 22 Oct 2019 17:17:38 +0800
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

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

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
---
v1->v2:
- Add comment to explain why the fix is needed.

 fs/ext2/balloc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 924c1c765306..18e75adcd2f6 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -1313,6 +1313,13 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ex=
t2_fsblk_t goal,
 =09if (free_blocks > 0) {
 =09=09grp_target_blk =3D ((goal - le32_to_cpu(es->s_first_data_block)) %
 =09=09=09=09EXT2_BLOCKS_PER_GROUP(sb));
+=09=09/*
+=09=09 * In a special case that allocated blocks are in system zone,
+=09=09 * we will retry block allocation due to failing to pass sanity
+=09=09 * check. In this case, the bitmap_bh is non-null pointer and we
+=09=09 * have to release it before calling read_block_bitmap().
+=09=09 */
+=09=09brelse(bitmap_bh);
 =09=09bitmap_bh =3D read_block_bitmap(sb, group_no);
 =09=09if (!bitmap_bh)
 =09=09=09goto io_error;
--=20
2.20.1