mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-01 00:58:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: pass struct btrfs_inode to btrfs_free_reserved_data_space_noquota()

Browse source 
As well as the last patch, pass struct btrfs_inode to the function and
let it distinguish which data space it is working on in a later patch.
There is no functional change with this commit.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Naohiro Aota 2025-04-23 11:43:42 +09:00 committed by David Sterba
parent 5d39fda880
commit 1c34e71966
4 changed files with 9 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
fs/btrfs/delalloc-space.c
View file

@ -151,7 +151,7 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode,
/* Use new btrfs_qgroup_reserve_data to reserve precious data space. */ /* Use new btrfs_qgroup_reserve_data to reserve precious data space. */
ret = btrfs_qgroup_reserve_data(inode, reserved, start, len); ret = btrfs_qgroup_reserve_data(inode, reserved, start, len);
if (ret < 0) { if (ret < 0) {
btrfs_free_reserved_data_space_noquota(fs_info, len); btrfs_free_reserved_data_space_noquota(inode, len);
extent_changeset_free(*reserved); extent_changeset_free(*reserved);
*reserved = NULL; *reserved = NULL;
} else { } else {
@ -168,9 +168,9 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode,
* which we can't sleep and is sure it won't affect qgroup reserved space. * which we can't sleep and is sure it won't affect qgroup reserved space.
* Like clear_bit_hook(). * Like clear_bit_hook().
*/ */
void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info, void btrfs_free_reserved_data_space_noquota(struct btrfs_inode *inode, u64 len)
u64 len)
{ {
struct btrfs_fs_info *fs_info = inode->root->fs_info;
struct btrfs_space_info *data_sinfo; struct btrfs_space_info *data_sinfo;
ASSERT(IS_ALIGNED(len, fs_info->sectorsize)); ASSERT(IS_ALIGNED(len, fs_info->sectorsize));
@ -196,7 +196,7 @@ void btrfs_free_reserved_data_space(struct btrfs_inode *inode,
round_down(start, fs_info->sectorsize); round_down(start, fs_info->sectorsize);
start = round_down(start, fs_info->sectorsize); start = round_down(start, fs_info->sectorsize);
btrfs_free_reserved_data_space_noquota(fs_info, len); btrfs_free_reserved_data_space_noquota(inode, len);
btrfs_qgroup_free_data(inode, reserved, start, len, NULL); btrfs_qgroup_free_data(inode, reserved, start, len, NULL);
} }

3
fs/btrfs/delalloc-space.h
View file

@ -18,8 +18,7 @@ void btrfs_free_reserved_data_space(struct btrfs_inode *inode,
void btrfs_delalloc_release_space(struct btrfs_inode *inode, void btrfs_delalloc_release_space(struct btrfs_inode *inode,
struct extent_changeset *reserved, struct extent_changeset *reserved,
u64 start, u64 len, bool qgroup_free); u64 start, u64 len, bool qgroup_free);
void btrfs_free_reserved_data_space_noquota(struct btrfs_fs_info *fs_info, void btrfs_free_reserved_data_space_noquota(struct btrfs_inode *inode, u64 len);
u64 len);
void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes, void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes,
bool qgroup_free); bool qgroup_free);
int btrfs_delalloc_reserve_space(struct btrfs_inode *inode, int btrfs_delalloc_reserve_space(struct btrfs_inode *inode,

4
fs/btrfs/inode.c
View file

@ -2596,7 +2596,7 @@ void btrfs_clear_delalloc_extent(struct btrfs_inode *inode,
!btrfs_is_free_space_inode(inode) && !btrfs_is_free_space_inode(inode) &&
!(state->state & EXTENT_NORESERVE) && !(state->state & EXTENT_NORESERVE) &&
(bits & EXTENT_CLEAR_DATA_RESV)) (bits & EXTENT_CLEAR_DATA_RESV))
btrfs_free_reserved_data_space_noquota(fs_info, len); btrfs_free_reserved_data_space_noquota(inode, len);
percpu_counter_add_batch(&fs_info->delalloc_bytes, -len, percpu_counter_add_batch(&fs_info->delalloc_bytes, -len,
fs_info->delalloc_batch); fs_info->delalloc_batch);
@ -9734,7 +9734,7 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,
* bytes_may_use. * bytes_may_use.
*/ */
if (!extent_reserved) if (!extent_reserved)
btrfs_free_reserved_data_space_noquota(fs_info, disk_num_bytes); btrfs_free_reserved_data_space_noquota(inode, disk_num_bytes);
out_unlock: out_unlock:
btrfs_unlock_extent(io_tree, start, end, &cached_state); btrfs_unlock_extent(io_tree, start, end, &cached_state);
out_folios: out_folios:

4
fs/btrfs/relocation.c
View file

@ -2748,8 +2748,8 @@ static noinline_for_stack int prealloc_file_extent_cluster(struct reloc_control
btrfs_inode_unlock(inode, 0); btrfs_inode_unlock(inode, 0);
if (cur_offset < prealloc_end) if (cur_offset < prealloc_end)
btrfs_free_reserved_data_space_noquota(inode->root->fs_info, btrfs_free_reserved_data_space_noquota(inode,
prealloc_end + 1 - cur_offset); prealloc_end + 1 - cur_offset);
return ret; return ret;
} }