Commit 2ffd2a6a authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

ext4: remove unnecessary parameter "needed" in ext4_discard_preallocations 



The "needed" controls the number of ext4_prealloc_space to discard in
ext4_discard_preallocations. Function ext4_discard_preallocations is
supposed to discard all non-used preallocated blocks when "needed"
is 0 and now ext4_discard_preallocations is always called with "needed"
= 0. Remove unnecessary parameter "needed" and remove all non-used
preallocated spaces in ext4_discard_preallocations to simplify the
code.

Note: If count of non-used preallocated spaces could be more than
UINT_MAX, there was a memory leak as some non-used preallocated
spaces are left ununsed and this commit will fix it. Otherwise,
there is no behavior change.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20240105092102.496631-9-shikemeng@huaweicloud.com


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

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -2915,7 +2915,7 @@ extern int ext4_mb_init(struct super_block *); 
extern void ext4_mb_release(struct super_block *);

extern ext4_fsblk_t ext4_mb_new_blocks(handle_t *,

				struct ext4_allocation_request *, int *);

extern void ext4_discard_preallocations(struct inode *, unsigned int);

extern void ext4_discard_preallocations(struct inode *);

extern int __init ext4_init_mballoc(void);

extern void ext4_exit_mballoc(void);

extern ext4_group_t ext4_mb_prefetch(struct super_block *sb,

fs/ext4/extents.c

+5 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int ext4_ext_trunc_restart_fn(struct inode *inode, int *dropped) 
	 * i_rwsem. So we can safely drop the i_data_sem here.

	 */

	BUG_ON(EXT4_JOURNAL(inode) == NULL);

	ext4_discard_preallocations(inode, 0);

	ext4_discard_preallocations(inode);

	up_write(&EXT4_I(inode)->i_data_sem);

	*dropped = 1;

	return 0;
@@ -4313,7 +4313,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 
			 * not a good idea to call discard here directly,

			 * but otherwise we'd need to call it every free().

			 */

			ext4_discard_preallocations(inode, 0);

			ext4_discard_preallocations(inode);

			if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)

				fb_flags = EXT4_FREE_BLOCKS_NO_QUOT_UPDATE;

			ext4_free_blocks(handle, inode, NULL, newblock,
@@ -5357,7 +5357,7 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len) 
	ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_FALLOC_RANGE, handle);



	down_write(&EXT4_I(inode)->i_data_sem);

	ext4_discard_preallocations(inode, 0);

	ext4_discard_preallocations(inode);

	ext4_es_remove_extent(inode, punch_start, EXT_MAX_BLOCKS - punch_start);



	ret = ext4_ext_remove_space(inode, punch_start, punch_stop - 1);
@@ -5365,7 +5365,7 @@ static int ext4_collapse_range(struct file *file, loff_t offset, loff_t len) 
		up_write(&EXT4_I(inode)->i_data_sem);

		goto out_stop;

	}

	ext4_discard_preallocations(inode, 0);

	ext4_discard_preallocations(inode);



	ret = ext4_ext_shift_extents(inode, handle, punch_stop,

				     punch_stop - punch_start, SHIFT_LEFT);
@@ -5497,7 +5497,7 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len) 
		goto out_stop;



	down_write(&EXT4_I(inode)->i_data_sem);

	ext4_discard_preallocations(inode, 0);

	ext4_discard_preallocations(inode);



	path = ext4_find_extent(inode, offset_lblk, NULL, 0);

	if (IS_ERR(path)) {

fs/ext4/file.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int ext4_release_file(struct inode *inode, struct file *filp) 
			(atomic_read(&inode->i_writecount) == 1) &&

			!EXT4_I(inode)->i_reserved_data_blocks) {

		down_write(&EXT4_I(inode)->i_data_sem);

		ext4_discard_preallocations(inode, 0);

		ext4_discard_preallocations(inode);

		up_write(&EXT4_I(inode)->i_data_sem);

	}

	if (is_dx(inode) && filp->private_data)

fs/ext4/indirect.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static int ext4_ind_trunc_restart_fn(handle_t *handle, struct inode *inode, 
	 * i_rwsem. So we can safely drop the i_data_sem here.

	 */

	BUG_ON(EXT4_JOURNAL(inode) == NULL);

	ext4_discard_preallocations(inode, 0);

	ext4_discard_preallocations(inode);

	up_write(&EXT4_I(inode)->i_data_sem);

	*dropped = 1;

	return 0;

fs/ext4/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ void ext4_da_update_reserve_space(struct inode *inode, 
	 */

	if ((ei->i_reserved_data_blocks == 0) &&

	    !inode_is_open_for_write(inode))

		ext4_discard_preallocations(inode, 0);

		ext4_discard_preallocations(inode);

}



static int __check_block_validity(struct inode *inode, const char *func,
@@ -4017,7 +4017,7 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) 
	if (stop_block > first_block) {



		down_write(&EXT4_I(inode)->i_data_sem);

		ext4_discard_preallocations(inode, 0);

		ext4_discard_preallocations(inode);



		ext4_es_remove_extent(inode, first_block,

				      stop_block - first_block);
@@ -4170,7 +4170,7 @@ int ext4_truncate(struct inode *inode) 


	down_write(&EXT4_I(inode)->i_data_sem);



	ext4_discard_preallocations(inode, 0);

	ext4_discard_preallocations(inode);



	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))

		err = ext4_ext_truncate(handle, inode);