GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 07:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: make btrfs_check_data_free_space take btrfs_inode

Browse source 
Instead of calling BTRFS_I on the passed vfs_inode take btrfs_inode
directly.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2020-06-03 08:55:41 +03:00 • committed by David Sterba
parent 86d52921a2
commit 36ea6f3e93
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/btrfs/block-group.c
View file

@ -2508,7 +2508,8 @@ again:
num_pages *= 16; num_pages *= 16;
num_pages *= PAGE_SIZE; num_pages *= PAGE_SIZE;
ret = btrfs_check_data_free_space(inode, &data_reserved, 0, num_pages); ret = btrfs_check_data_free_space(BTRFS_I(inode), &data_reserved, 0,
num_pages);
if (ret) if (ret)
goto out_put; goto out_put;

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

@ -237,10 +237,10 @@ commit_trans:
return 0; return 0;
} }
int btrfs_check_data_free_space(struct inode *inode, int btrfs_check_data_free_space(struct btrfs_inode *inode,
struct extent_changeset **reserved, u64 start, u64 len) struct extent_changeset **reserved, u64 start, u64 len)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = inode->root->fs_info;
int ret; int ret;
/* align the range */ /* align the range */
@ -248,12 +248,12 @@ int btrfs_check_data_free_space(struct 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);
ret = btrfs_alloc_data_chunk_ondemand(BTRFS_I(inode), len); ret = btrfs_alloc_data_chunk_ondemand(inode, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* 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(BTRFS_I(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(fs_info, len);
else else
@ -558,7 +558,7 @@ int btrfs_delalloc_reserve_space(struct inode *inode,
{ {
int ret; int ret;
ret = btrfs_check_data_free_space(inode, reserved, start, len); ret = btrfs_check_data_free_space(BTRFS_I(inode), reserved, start, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len); ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len);

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

@ -6,7 +6,7 @@
struct extent_changeset; struct extent_changeset;
int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes); int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes);
int btrfs_check_data_free_space(struct inode *inode, int btrfs_check_data_free_space(struct btrfs_inode *inode,
struct extent_changeset **reserved, u64 start, u64 len); struct extent_changeset **reserved, u64 start, u64 len);
void btrfs_free_reserved_data_space(struct btrfs_inode *inode, void btrfs_free_reserved_data_space(struct btrfs_inode *inode,
struct extent_changeset *reserved, u64 start, u64 len); struct extent_changeset *reserved, u64 start, u64 len);

3
fs/btrfs/file.c
View file

@ -1681,7 +1681,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
fs_info->sectorsize); fs_info->sectorsize);
extent_changeset_release(data_reserved); extent_changeset_release(data_reserved);
ret = btrfs_check_data_free_space(inode, &data_reserved, pos, ret = btrfs_check_data_free_space(BTRFS_I(inode),
&data_reserved, pos,
write_bytes); write_bytes);
if (ret < 0) { if (ret < 0) {
if (btrfs_check_nocow_lock(BTRFS_I(inode), pos, if (btrfs_check_nocow_lock(BTRFS_I(inode), pos,

4
fs/btrfs/inode.c
View file

@ -4519,8 +4519,8 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,
block_end = block_start + blocksize - 1; block_end = block_start + blocksize - 1;
ret = btrfs_check_data_free_space(inode, &data_reserved, block_start, ret = btrfs_check_data_free_space(BTRFS_I(inode), &data_reserved,
blocksize); block_start, blocksize);
if (ret < 0) { if (ret < 0) {
if (btrfs_check_nocow_lock(BTRFS_I(inode), block_start, if (btrfs_check_nocow_lock(BTRFS_I(inode), block_start,
&write_bytes) > 0) { &write_bytes) > 0) {