Commit a9082589 authored by Zhang Yi's avatar Zhang Yi Committed by Theodore Ts'o
Browse files

ext4: don't pass full mapping flags to ext4_es_insert_extent() 



When converting a delalloc extent in ext4_es_insert_extent(), since we
only want to pass the info of whether the quota has already been claimed
if the allocation is a direct allocation from ext4_map_create_blocks(),
there is no need to pass full mapping flags, so changes to just pass
whether the EXT4_GET_BLOCKS_DELALLOC_RESERVE bit is set.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240906061401.2980330-1-yi.zhang@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 667de03a

fs/ext4/extents.c

+2 −2
Original line number Diff line number Diff line
@@ -3138,7 +3138,7 @@ static void ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex) 
		return;



	ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock,

			      EXTENT_STATUS_WRITTEN, 0);

			      EXTENT_STATUS_WRITTEN, false);

}



/* FIXME!! we need to try to merge to left or right after zero-out  */
@@ -4158,7 +4158,7 @@ static ext4_lblk_t ext4_ext_determine_insert_hole(struct inode *inode, 
	/* Put just found gap into cache to speed up subsequent requests */

	ext_debug(inode, " -> %u:%u\n", hole_start, len);

	ext4_es_insert_extent(inode, hole_start, len, ~0,

			      EXTENT_STATUS_HOLE, 0);

			      EXTENT_STATUS_HOLE, false);



	/* Update hole_len to reflect hole size after lblk */

	if (hole_start != lblk)

fs/ext4/extents_status.c

+4 −4
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ static int __es_insert_extent(struct inode *inode, struct extent_status *newes, 
 */

void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,

			   ext4_lblk_t len, ext4_fsblk_t pblk,

			   unsigned int status, int flags)

			   unsigned int status, bool delalloc_reserve_used)

{

	struct extent_status newes;

	ext4_lblk_t end = lblk + len - 1;
@@ -863,8 +863,8 @@ void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 
	if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)

		return;



	es_debug("add [%u/%u) %llu %x %x to extent status tree of inode %lu\n",

		 lblk, len, pblk, status, flags, inode->i_ino);

	es_debug("add [%u/%u) %llu %x %d to extent status tree of inode %lu\n",

		 lblk, len, pblk, status, delalloc_reserve_used, inode->i_ino);



	if (!len)

		return;
@@ -945,7 +945,7 @@ void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 
	resv_used += pending;

	if (resv_used)

		ext4_da_update_reserve_space(inode, resv_used,

				flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE);

					     delalloc_reserve_used);



	if (err1 || err2 || err3 < 0)

		goto retry;

fs/ext4/extents_status.h

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ extern void ext4_es_init_tree(struct ext4_es_tree *tree); 


extern void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,

				  ext4_lblk_t len, ext4_fsblk_t pblk,

				  unsigned int status, int flags);

				  unsigned int status,

				  bool delalloc_reserve_used);

extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk,

				 ext4_lblk_t len, ext4_fsblk_t pblk,

				 unsigned int status);

fs/ext4/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static int ext4_map_query_blocks(handle_t *handle, struct inode *inode, 
	status = map->m_flags & EXT4_MAP_UNWRITTEN ?

			EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;

	ext4_es_insert_extent(inode, map->m_lblk, map->m_len,

			      map->m_pblk, status, 0);

			      map->m_pblk, status, false);

	return retval;

}
@@ -563,8 +563,8 @@ static int ext4_map_create_blocks(handle_t *handle, struct inode *inode, 


	status = map->m_flags & EXT4_MAP_UNWRITTEN ?

			EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;

	ext4_es_insert_extent(inode, map->m_lblk, map->m_len,

			      map->m_pblk, status, flags);

	ext4_es_insert_extent(inode, map->m_lblk, map->m_len, map->m_pblk,

			      status, flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE);



	return retval;

}