Commit 797ac3ca authored by Ritesh Harjani (IBM)'s avatar Ritesh Harjani (IBM) Committed by Theodore Ts'o
Browse files

ext4: Simplify last in leaf check in ext4_map_query_blocks 



This simplifies the check for last in leaf in ext4_map_query_blocks()
and fixes this cocci warning.

cocci warnings: (new ones prefixed by >>)
>> fs/ext4/inode.c:573:49-51: WARNING !A || A && B is equivalent to !A || B

Fixes: 5bb12b18 ("ext4: Add support for EXT4_GET_BLOCKS_QUERY_LEAF_BLOCKS")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202505191524.auftmOwK-lkp@intel.com/


Signed-off-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Reviewed-by: default avatarOjaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://patch.msgid.link/5fd5c806218c83f603c578c95997cf7f6da29d74.1747677758.git.ritesh.list@gmail.com


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

fs/ext4/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -570,8 +570,7 @@ static int ext4_map_query_blocks(handle_t *handle, struct inode *inode, 
	 * - if the last in leaf is the full requested range

	 */

	if (!(map->m_flags & EXT4_MAP_QUERY_LAST_IN_LEAF) ||

			((map->m_flags & EXT4_MAP_QUERY_LAST_IN_LEAF) &&

			 (map->m_len == orig_mlen))) {

			map->m_len == orig_mlen) {

		status = map->m_flags & EXT4_MAP_UNWRITTEN ?

				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;

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