Commit 8782b020 authored by Baokun Li's avatar Baokun Li Committed by Theodore Ts'o
Browse files

ext4: make ext4_es_insert_delayed_block() return void 

Now it never fails when inserting a delay extent, so the return value in
ext4_es_insert_delayed_block is no longer necessary, let it return void.

[ Fixed bug which caused system hangs during bigalloc test runs.  See
 https://lore.kernel.org/r/20230612030405.GH1436857@mit.edu

 for more
 details.  -- TYT ]

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-11-libaokun1@huawei.com


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

fs/ext4/extents_status.c

+4 −6
Original line number Diff line number Diff line
@@ -2016,10 +2016,8 @@ bool ext4_is_pending(struct inode *inode, ext4_lblk_t lblk) 
 * @lblk - logical block to be added

 * @allocated - indicates whether a physical cluster has been allocated for

 *              the logical cluster that contains the block

 *

 * Returns 0 on success, negative error code on failure.

 */

int ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk,

void ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk,

				  bool allocated)

{

	struct extent_status newes;
@@ -2029,7 +2027,7 @@ int ext4_es_insert_delayed_block(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/1) delayed to extent status tree of inode %lu\n",

		 lblk, inode->i_ino);
@@ -2071,7 +2069,7 @@ int ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk, 


	ext4_es_print_tree(inode);

	ext4_print_pending_tree(inode);

	return 0;

	return;

}



/*

fs/ext4/extents_status.h

+2 −2
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ extern void ext4_exit_pending(void); 
extern void ext4_init_pending_tree(struct ext4_pending_tree *tree);

extern void ext4_remove_pending(struct inode *inode, ext4_lblk_t lblk);

extern bool ext4_is_pending(struct inode *inode, ext4_lblk_t lblk);

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

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

					 bool allocated);

extern unsigned int ext4_es_delayed_clu(struct inode *inode, ext4_lblk_t lblk,

					ext4_lblk_t len);

fs/ext4/inode.c

+5 −12
Original line number Diff line number Diff line
@@ -1630,7 +1630,6 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk) 
	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	int ret;

	bool allocated = false;

	bool reserved = false;



	/*

	 * If the cluster containing lblk is shared with a delayed,
@@ -1646,8 +1645,7 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk) 
	if (sbi->s_cluster_ratio == 1) {

		ret = ext4_da_reserve_space(inode);

		if (ret != 0)   /* ENOSPC */

			goto errout;

		reserved = true;

			return ret;

	} else {   /* bigalloc */

		if (!ext4_es_scan_clu(inode, &ext4_es_is_delonly, lblk)) {

			if (!ext4_es_scan_clu(inode,
@@ -1655,12 +1653,11 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk) 
				ret = ext4_clu_mapped(inode,

						      EXT4_B2C(sbi, lblk));

				if (ret < 0)

					goto errout;

					return ret;

				if (ret == 0) {

					ret = ext4_da_reserve_space(inode);

					if (ret != 0)   /* ENOSPC */

						goto errout;

					reserved = true;

						return ret;

				} else {

					allocated = true;

				}
@@ -1670,12 +1667,8 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk) 
		}

	}



	ret = ext4_es_insert_delayed_block(inode, lblk, allocated);

	if (ret && reserved)

		ext4_da_release_space(inode, 1);



errout:

	return ret;

	ext4_es_insert_delayed_block(inode, lblk, allocated);

	return 0;

}



/*