Commit 6c120399 authored by Baokun Li's avatar Baokun Li Committed by Theodore Ts'o
Browse files

ext4: make ext4_es_insert_extent() return void 



Now ext4_es_insert_extent() never return error, so make it return void.

Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230424033846.4732-12-libaokun1@huawei.com


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

fs/ext4/extents.c

+3 −2
Original line number Diff line number Diff line
@@ -3136,8 +3136,9 @@ static int ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex) 
	if (ee_len == 0)

		return 0;



	return ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock,

	ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock,

			      EXTENT_STATUS_WRITTEN);

	return 0;

}



/* FIXME!! we need to try to merge to left or right after zero-out  */

fs/ext4/extents_status.c

+6 −8
Original line number Diff line number Diff line
@@ -829,10 +829,8 @@ static int __es_insert_extent(struct inode *inode, struct extent_status *newes, 
/*

 * ext4_es_insert_extent() adds information to an inode's extent

 * status tree.

 *

 * Return 0 on success, error code on failure.

 */

int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,

void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,

			   ext4_lblk_t len, ext4_fsblk_t pblk,

			   unsigned int status)

{
@@ -845,13 +843,13 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 
	struct extent_status *es2 = NULL;



	if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)

		return 0;

		return;



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

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



	if (!len)

		return 0;

		return;



	BUG_ON(end < lblk);
@@ -903,7 +901,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 
		goto retry;



	ext4_es_print_tree(inode);

	return 0;

	return;

}



/*

fs/ext4/extents_status.h

+3 −3
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ extern int __init ext4_init_es(void); 
extern void ext4_exit_es(void);

extern void ext4_es_init_tree(struct ext4_es_tree *tree);



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

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

				  ext4_lblk_t len, ext4_fsblk_t pblk,

				  unsigned int status);

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

fs/ext4/inode.c

+6 −15
Original line number Diff line number Diff line
@@ -567,10 +567,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 
		    ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk,

				       map->m_lblk + map->m_len - 1))

			status |= EXTENT_STATUS_DELAYED;

		ret = ext4_es_insert_extent(inode, map->m_lblk,

					    map->m_len, map->m_pblk, status);

		if (ret < 0)

			retval = ret;

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

				      map->m_pblk, status);

	}

	up_read((&EXT4_I(inode)->i_data_sem));
@@ -679,12 +677,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 
		    ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk,

				       map->m_lblk + map->m_len - 1))

			status |= EXTENT_STATUS_DELAYED;

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

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

				      map->m_pblk, status);

		if (ret < 0) {

			retval = ret;

			goto out_sem;

		}

	}



out_sem:
@@ -1765,7 +1759,6 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, 
		set_buffer_new(bh);

		set_buffer_delay(bh);

	} else if (retval > 0) {

		int ret;

		unsigned int status;



		if (unlikely(retval != map->m_len)) {
@@ -1778,10 +1771,8 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, 


		status = map->m_flags & EXT4_MAP_UNWRITTEN ?

				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;

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

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

				      map->m_pblk, status);

		if (ret != 0)

			retval = ret;

	}



out_unlock: