Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0dcbd4b authored by Wang Jianchao's avatar Wang Jianchao Committed by Greg Kroah-Hartman
Browse files

ext4: remove the 'group' parameter of ext4_trim_extent 



[ Upstream commit bd2eea8d0a6b6a9aca22f20bf74f73b71d8808af ]

Get rid of the 'group' parameter of ext4_trim_extent as we can get
it from the 'e4b'.

Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Signed-off-by: default avatarWang Jianchao <wangjianchao@kuaishou.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210724074124.25731-2-jianchao.wan9@gmail.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bf066075

fs/ext4/mballoc.c

+4 −5
Original line number Diff line number Diff line
@@ -5159,19 +5159,19 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb, 
 * @sb:		super block for the file system

 * @start:	starting block of the free extent in the alloc. group

 * @count:	number of blocks to TRIM

 * @group:	alloc. group we are working with

 * @e4b:	ext4 buddy for the group

 *

 * Trim "count" blocks starting at "start" in the "group". To assure that no

 * one will allocate those blocks, mark it as used in buddy bitmap. This must

 * be called with under the group lock.

 */

static int ext4_trim_extent(struct super_block *sb, int start, int count,

			     ext4_group_t group, struct ext4_buddy *e4b)

static int ext4_trim_extent(struct super_block *sb,

		int start, int count, struct ext4_buddy *e4b)

__releases(bitlock)

__acquires(bitlock)

{

	struct ext4_free_extent ex;

	ext4_group_t group = e4b->bd_group;

	int ret = 0;



	trace_ext4_trim_extent(sb, group, start, count);
@@ -5247,8 +5247,7 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, 
		next = mb_find_next_bit(bitmap, max + 1, start);



		if ((next - start) >= minblocks) {

			ret = ext4_trim_extent(sb, start,

					       next - start, group, &e4b);

			ret = ext4_trim_extent(sb, start, next - start, &e4b);

			if (ret && ret != -EOPNOTSUPP)

				break;

			ret = 0;