Commit 6066990c authored by Ojaswin Mujoo's avatar Ojaswin Mujoo Committed by Theodore Ts'o
Browse files

ext4: propagate flags to ext4_convert_unwritten_extents_endio() 



Currently, callers like ext4_convert_unwritten_extents() pass
EXT4_EX_NOCACHE flag to avoid caching extents however this is not
respected by ext4_convert_unwritten_extents_endio(). Hence, modify it to
accept flags from the caller and to pass the flags on to other extent
manipulation functions it calls. This makes sure the NOCACHE flag is
respected throughout the code path.

Also, since the caller already passes METADATA_NOFAIL and CONVERT flags
we don't need to explicitly pass it anymore.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarOjaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://patch.msgid.link/7c2139e0ad32c49c19b194f72219e15d613de284.1769149131.git.ojaswin@linux.ibm.com


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

fs/ext4/extents.c

+3 −6
Original line number Diff line number Diff line
@@ -3780,7 +3780,7 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle, 
static struct ext4_ext_path *

ext4_convert_unwritten_extents_endio(handle_t *handle, struct inode *inode,

				     struct ext4_map_blocks *map,

				     struct ext4_ext_path *path)

				     struct ext4_ext_path *path, int flags)

{

	struct ext4_extent *ex;

	ext4_lblk_t ee_block;
@@ -3797,15 +3797,12 @@ ext4_convert_unwritten_extents_endio(handle_t *handle, struct inode *inode, 
		  (unsigned long long)ee_block, ee_len);



	if (ee_block != map->m_lblk || ee_len > map->m_len) {

		int flags = EXT4_GET_BLOCKS_CONVERT |

			    EXT4_GET_BLOCKS_METADATA_NOFAIL;



		path = ext4_split_convert_extents(handle, inode, map, path,

						  flags, NULL);

		if (IS_ERR(path))

			return path;



		path = ext4_find_extent(inode, map->m_lblk, path, 0);

		path = ext4_find_extent(inode, map->m_lblk, path, flags);

		if (IS_ERR(path))

			return path;

		depth = ext_depth(inode);
@@ -3938,7 +3935,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode, 
	/* IO end_io complete, convert the filled extent to written */

	if (flags & EXT4_GET_BLOCKS_CONVERT) {

		path = ext4_convert_unwritten_extents_endio(handle, inode,

							    map, path);

							    map, path, flags);

		if (IS_ERR(path))

			return path;

		ext4_update_inode_fsync_trans(handle, inode, 1);