From: Kemeng Shi <shikemeng@huaweicloud.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz
Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 08/21] ext4: add missed brelse in ext4_free_blocks_simple
Date: Fri, 10 Feb 2023 03:48:12 +0800 [thread overview]
Message-ID: <20230209194825.511043-9-shikemeng@huaweicloud.com> (raw)
In-Reply-To: <20230209194825.511043-1-shikemeng@huaweicloud.com>
Release bitmap buffer_head we got if error occurs.
Besides, this patch remove unused assignment to err.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
fs/ext4/mballoc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 4e1caac74b44..17ac98c501ed 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -5848,13 +5848,12 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block,
ext4_get_group_no_and_offset(sb, block, &group, &blkoff);
bitmap_bh = ext4_read_block_bitmap(sb, group);
if (IS_ERR(bitmap_bh)) {
- err = PTR_ERR(bitmap_bh);
pr_warn("Failed to read block bitmap\n");
return;
}
gdp = ext4_get_group_desc(sb, group, &gdp_bh);
if (!gdp)
- return;
+ goto err_out;
for (i = 0; i < count; i++) {
if (!mb_test_bit(blkoff + i, bitmap_bh->b_data))
@@ -5863,7 +5862,7 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block,
mb_clear_bits(bitmap_bh->b_data, blkoff, count);
err = ext4_handle_dirty_metadata(NULL, NULL, bitmap_bh);
if (err)
- return;
+ goto err_out;
ext4_free_group_clusters_set(
sb, gdp, ext4_free_group_clusters(sb, gdp) +
count - already_freed);
@@ -5872,6 +5871,8 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block,
ext4_handle_dirty_metadata(NULL, NULL, gdp_bh);
sync_dirty_buffer(bitmap_bh);
sync_dirty_buffer(gdp_bh);
+
+err_out:
brelse(bitmap_bh);
}
--
2.30.0
next prev parent reply other threads:[~2023-02-09 11:57 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 19:48 [PATCH 00/21] Some bugfix and cleanup to mballoc Kemeng Shi
2023-02-09 19:48 ` [PATCH 01/21] ext4: set goal start correctly in ext4_mb_normalize_request Kemeng Shi
2023-02-13 6:56 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 02/21] ext4: allow to find by goal if EXT4_MB_HINT_GOAL_ONLY is set Kemeng Shi
2023-02-13 6:57 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 03/21] ext4: avoid to use preallocated blocks " Kemeng Shi
2023-02-13 8:38 ` Ojaswin Mujoo
2023-02-13 13:27 ` Kemeng Shi
2023-02-09 19:48 ` [PATCH 04/21] ext4: get correct ext4_group_info in ext4_mb_prefetch_fini Kemeng Shi
2023-02-13 7:03 ` Ojaswin Mujoo
2023-02-13 12:27 ` Kemeng Shi
2023-02-13 20:14 ` Ojaswin Mujoo
2023-02-14 1:12 ` Kemeng Shi
2023-02-17 6:46 ` Ritesh Harjani
2023-02-17 7:19 ` Kemeng Shi
2023-02-09 19:48 ` [PATCH 05/21] ext4: correct calculation of s_mb_preallocated Kemeng Shi
2023-02-13 7:04 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 06/21] ext4: correct start of used group pa for debug in ext4_mb_use_group_pa Kemeng Shi
2023-02-13 7:09 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 07/21] ext4: protect pa->pa_free in ext4_discard_allocated_blocks Kemeng Shi
2023-02-13 8:42 ` Ojaswin Mujoo
2023-02-09 19:48 ` Kemeng Shi [this message]
2023-02-13 19:46 ` [PATCH 08/21] ext4: add missed brelse in ext4_free_blocks_simple Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 09/21] ext4: remove unused return value of ext4_mb_try_best_found and ext4_mb_free_metadata Kemeng Shi
2023-02-13 19:47 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 10/21] ext4: Remove unnecessary release when memory allocation failed in ext4_mb_init_cache Kemeng Shi
2023-02-13 19:48 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 11/21] ext4: remove unnecessary e4b->bd_buddy_page check in ext4_mb_load_buddy_gfp Kemeng Shi
2023-02-13 19:48 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 12/21] ext4: remove unnecessary check in ext4_mb_new_blocks Kemeng Shi
2023-02-13 19:49 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 13/21] ext4: remove dead check in mb_buddy_mark_free Kemeng Shi
2023-02-13 19:50 ` Ojaswin Mujoo
2023-02-17 1:24 ` Kemeng Shi
2023-02-09 19:48 ` [PATCH 14/21] ext4: remove ac->ac_found > sbi->s_mb_min_to_scan dead check in ext4_mb_check_limits Kemeng Shi
2023-02-13 19:51 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 15/21] ext4: use best found when complex scan of group finishs Kemeng Shi
2023-02-13 19:53 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 16/21] ext4: remove unnecessary exit_meta_group_info tag Kemeng Shi
2023-02-13 19:54 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 17/21] ext4: remove unnecessary count2 in ext4_free_data_in_buddy Kemeng Shi
2023-02-13 19:56 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 18/21] ext4: remove unnecessary goto in ext4_mb_mark_diskspace_used Kemeng Shi
2023-02-13 19:58 ` Ojaswin Mujoo
2023-02-17 6:36 ` Ritesh Harjani
2023-02-09 19:48 ` [PATCH 19/21] ext4: remove repeat assignment to ac_f_ex Kemeng Shi
2023-02-13 20:10 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 20/21] ext4: remove comment code ext4_discard_preallocations Kemeng Shi
2023-02-13 20:11 ` Ojaswin Mujoo
2023-02-09 19:48 ` [PATCH 21/21] ext4: simplify calculation of blkoff in ext4_mb_new_blocks_simple Kemeng Shi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230209194825.511043-9-shikemeng@huaweicloud.com \
--to=shikemeng@huaweicloud.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).