xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: remove the 'group' parameter of ext4_trim_extent

Browse Source 
[ Upstream commit bd2eea8d0a6b6a9aca22f20bf74f73b71d8808af ]

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

Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Wang Jianchao <wangjianchao@kuaishou.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210724074124.25731-2-jianchao.wan9@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Wang Jianchao
2021-07-24 15:41:20 +08:00
committed by Greg Kroah-Hartman
parent 69c9665830
commit 6f5fc957df
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/ext4/mballoc.c
View File

@@ -5859,19 +5859,19 @@ error_return:
* @sb: super block for the file system * @sb: super block for the file system
* @start: starting block of the free extent in the alloc. group * @start: starting block of the free extent in the alloc. group
* @count: number of blocks to TRIM * @count: number of blocks to TRIM
* @group: alloc. group we are working with
* @e4b: ext4 buddy for the group * @e4b: ext4 buddy for the group
* *
* Trim "count" blocks starting at "start" in the "group". To assure that no * 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 * one will allocate those blocks, mark it as used in buddy bitmap. This must
* be called with under the group lock. * be called with under the group lock.
*/ */
static int ext4_trim_extent(struct super_block *sb, int start, int count, static int ext4_trim_extent(struct super_block *sb,
ext4_group_t group, struct ext4_buddy *e4b) int start, int count, struct ext4_buddy *e4b)
__releases(bitlock) __releases(bitlock)
__acquires(bitlock) __acquires(bitlock)
{ {
struct ext4_free_extent ex; struct ext4_free_extent ex;
ext4_group_t group = e4b->bd_group;
int ret = 0; int ret = 0;
trace_ext4_trim_extent(sb, group, start, count); trace_ext4_trim_extent(sb, group, start, count);
@@ -5947,8 +5947,7 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group,
next = mb_find_next_bit(bitmap, max + 1, start); next = mb_find_next_bit(bitmap, max + 1, start);
if ((next - start) >= minblocks) { if ((next - start) >= minblocks) {
ret = ext4_trim_extent(sb, start, ret = ext4_trim_extent(sb, start, next - start, &e4b);
next - start, group, &e4b);
if (ret && ret != -EOPNOTSUPP) if (ret && ret != -EOPNOTSUPP)
break; break;
ret = 0; ret = 0;