mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: libaokun@huaweicloud.com
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz,
	ritesh.list@gmail.com, linux-kernel@vger.kernel.org,
	yi.zhang@huawei.com, yangerkun@huawei.com,
	libaokun@huaweicloud.com, Baokun Li <libaokun1@huawei.com>
Subject: [PATCH 04/20] ext4: add new ext4_ext_path_brelse() helper
Date: Wed, 10 Jul 2024 12:06:38 +0800	[thread overview]
Message-ID: <20240710040654.1714672-5-libaokun@huaweicloud.com> (raw)
In-Reply-To: <20240710040654.1714672-1-libaokun@huaweicloud.com>

From: Baokun Li <libaokun1@huawei.com>

Add ext4_ext_path_brelse() helper function to reduce duplicate code
and ensure that path->p_bh is set to NULL after it is released.

Signed-off-by: Baokun Li <libaokun1@huawei.com>
---
 fs/ext4/extents.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 657baf3991c1..6e5b5baf3aa6 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -106,6 +106,12 @@ static int ext4_ext_trunc_restart_fn(struct inode *inode, int *dropped)
 	return 0;
 }
 
+static inline void ext4_ext_path_brelse(struct ext4_ext_path *path)
+{
+	brelse(path->p_bh);
+	path->p_bh = NULL;
+}
+
 static void ext4_ext_drop_refs(struct ext4_ext_path *path)
 {
 	int depth, i;
@@ -113,10 +119,8 @@ static void ext4_ext_drop_refs(struct ext4_ext_path *path)
 	if (!path)
 		return;
 	depth = path->p_depth;
-	for (i = 0; i <= depth; i++, path++) {
-		brelse(path->p_bh);
-		path->p_bh = NULL;
-	}
+	for (i = 0; i <= depth; i++, path++)
+		ext4_ext_path_brelse(path);
 }
 
 void ext4_free_ext_path(struct ext4_ext_path *path)
@@ -635,8 +639,7 @@ int ext4_ext_precache(struct inode *inode)
 		 */
 		if ((i == depth) ||
 		    path[i].p_idx > EXT_LAST_INDEX(path[i].p_hdr)) {
-			brelse(path[i].p_bh);
-			path[i].p_bh = NULL;
+			ext4_ext_path_brelse(path + i);
 			i--;
 			continue;
 		}
@@ -1887,8 +1890,7 @@ static void ext4_ext_try_to_merge_up(handle_t *handle,
 		(path[1].p_ext - EXT_FIRST_EXTENT(path[1].p_hdr));
 	path[0].p_hdr->eh_max = cpu_to_le16(max_root);
 
-	brelse(path[1].p_bh);
-	path[1].p_bh = NULL;
+	ext4_ext_path_brelse(path + 1);
 	ext4_free_blocks(handle, inode, NULL, blk, 1,
 			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);
 }
@@ -2956,8 +2958,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
 			err = ext4_ext_rm_leaf(handle, inode, path,
 					       &partial, start, end);
 			/* root level has p_bh == NULL, brelse() eats this */
-			brelse(path[i].p_bh);
-			path[i].p_bh = NULL;
+			ext4_ext_path_brelse(path + i);
 			i--;
 			continue;
 		}
@@ -3019,8 +3020,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
 				err = ext4_ext_rm_idx(handle, inode, path, i);
 			}
 			/* root level has p_bh == NULL, brelse() eats this */
-			brelse(path[i].p_bh);
-			path[i].p_bh = NULL;
+			ext4_ext_path_brelse(path + i);
 			i--;
 			ext_debug(inode, "return to level %d\n", i);
 		}
-- 
2.39.2


  parent reply	other threads:[~2024-07-10  4:09 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-10  4:06 [PATCH 00/20] ext4: some bugfixes and cleanups for ext4 extents path libaokun
2024-07-10  4:06 ` [PATCH 01/20] ext4: refactor ext4_ext_rm_idx() to index 'path' libaokun
2024-07-24 18:44   ` Jan Kara
2024-07-25  9:14   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 02/20] ext4: prevent partial update of the extents path libaokun
2024-07-14 15:42   ` Ojaswin Mujoo
2024-07-15 12:33     ` Baokun Li
2024-07-15 12:41       ` Baokun Li
2024-07-16  9:54         ` Ojaswin Mujoo
2024-07-16 11:54           ` Baokun Li
2024-07-17  5:29             ` Ojaswin Mujoo
2024-07-17  6:11               ` Baokun Li
2024-07-24  6:23                 ` Ojaswin Mujoo
2024-07-25  5:35                   ` Baokun Li
2024-07-25  8:48                     ` Ojaswin Mujoo
2024-07-24 18:53   ` Jan Kara
2024-07-10  4:06 ` [PATCH 03/20] ext4: fix double brelse() the buffer " libaokun
2024-07-24 19:01   ` Jan Kara
2024-07-26 11:45   ` Ojaswin Mujoo
2024-07-30  8:47     ` Baokun Li
2024-08-01  6:26       ` Ojaswin Mujoo
2024-07-10  4:06 ` libaokun [this message]
2024-07-24 19:02   ` [PATCH 04/20] ext4: add new ext4_ext_path_brelse() helper Jan Kara
2024-07-26 11:53   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 05/20] ext4: fix slab-use-after-free in ext4_split_extent_at() libaokun
2024-07-24 19:13   ` Jan Kara
2024-07-27 10:36   ` Ojaswin Mujoo
2024-07-30  8:57     ` Baokun Li
2024-07-30  9:26       ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 06/20] ext4: avoid use-after-free in ext4_ext_show_leaf() libaokun
2024-07-24 19:16   ` Jan Kara
2024-07-25  5:41     ` Baokun Li
2024-07-27 10:43   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 07/20] ext4: drop ppath from ext4_ext_replay_update_ex() to avoid double-free libaokun
2024-07-25 10:31   ` Jan Kara
2024-07-27 11:18   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 08/20] ext4: get rid of ppath in ext4_find_extent() libaokun
2024-07-25 10:38   ` Jan Kara
2024-07-27  6:18     ` Baokun Li
2024-07-29 11:28       ` Jan Kara
2024-07-30 10:03   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 09/20] ext4: get rid of ppath in get_ext_path() libaokun
2024-07-25 10:41   ` Jan Kara
2024-08-01  7:16   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 10/20] ext4: get rid of ppath in ext4_ext_create_new_leaf() libaokun
2024-07-25 10:46   ` Jan Kara
2024-07-27  6:35     ` Baokun Li
2024-08-02  7:34   ` Ojaswin Mujoo
2024-08-02 13:07     ` Baokun Li
2024-07-10  4:06 ` [PATCH 11/20] ext4: get rid of ppath in ext4_ext_insert_extent() libaokun
2024-07-25 10:59   ` Jan Kara
2024-08-02  8:01   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 12/20] ext4: get rid of ppath in ext4_split_extent_at() libaokun
2024-07-25 11:07   ` Jan Kara
2024-07-27  6:42     ` Baokun Li
2024-08-21  3:19       ` Theodore Ts'o
2024-08-21  3:29         ` Baokun Li
2024-08-02  8:12   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 13/20] ext4: get rid of ppath in ext4_force_split_extent_at() libaokun
2024-07-25 11:14   ` Jan Kara
2024-08-02 20:01   ` Ojaswin Mujoo
2024-08-03  2:23     ` Baokun Li
2024-07-10  4:06 ` [PATCH 14/20] ext4: get rid of ppath in ext4_split_extent() libaokun
2024-07-25 12:07   ` Jan Kara
2024-08-02 20:17   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 15/20] ext4: get rid of ppath in ext4_split_convert_extents() libaokun
2024-07-25 12:12   ` Jan Kara
2024-08-02 20:26   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 16/20] ext4: get rid of ppath in ext4_convert_unwritten_extents_endio() libaokun
2024-07-25 12:14   ` Jan Kara
2024-08-02 20:28   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 17/20] ext4: get rid of ppath in ext4_ext_convert_to_initialized() libaokun
2024-07-25 12:18   ` Jan Kara
2024-08-02 20:38   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 18/20] ext4: get rid of ppath in ext4_ext_handle_unwritten_extents() libaokun
2024-07-25 12:22   ` Jan Kara
2024-08-02 20:44   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 19/20] ext4: get rid of ppath in convert_initialized_extent() libaokun
2024-07-25 12:23   ` Jan Kara
2024-08-02 20:46   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 20/20] ext4: avoid unnecessary extent path frees and allocations libaokun
2024-07-25 12:31   ` Jan Kara
2024-08-02 20:58   ` Ojaswin Mujoo
2024-07-25  9:02 ` [PATCH 00/20] ext4: some bugfixes and cleanups for ext4 extents path Ojaswin Mujoo

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=20240710040654.1714672-5-libaokun@huaweicloud.com \
    --to=libaokun@huaweicloud.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=jack@suse.cz \
    --cc=libaokun1@huawei.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ritesh.list@gmail.com \
    --cc=tytso@mit.edu \
    --cc=yangerkun@huawei.com \
    --cc=yi.zhang@huawei.com \
    /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

all inboxes | Powered by JetHome®