Re: [PATCH V2 1/7] ext4: remove the 'group' parameter of ext4_trim_extent
From: Andreas Dilger <hidden>
Date: 2021-05-27 19:48:10
Also in:
lkml
On May 26, 2021, at 2:42 AM, Wang Jianchao [off-list ref] wrote: Get rid of the 'group' parameter of ext4_trim_extent as we can get it from the 'e4b'. Signed-off-by: Wang Jianchao <redacted>
Reviewed-by: Andreas Dilger <redacted>
quoted hunk ↗ jump to hunk
--- fs/ext4/mballoc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index a02fadf..d81f1fd22 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c@@ -5650,19 +5650,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);@@ -5738,8 +5738,7 @@ static int ext4_trim_extent(struct super_block *sb, int start, int count,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; -- 1.8.3.1
Cheers, Andreas
Attachments
- signature.asc [application/pgp-signature] 873 bytes