mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
btrfs: make btrfs_qgroup_reserve_data take btrfs_inode
commit 7661a3e033
upstream
There's only a single use of vfs_inode in a tracepoint so let's 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>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
dfadea4061
commit
b7a722fd75
4 changed files with 11 additions and 10 deletions
|
@ -151,7 +151,7 @@ int btrfs_check_data_free_space(struct inode *inode,
|
||||||
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(inode, reserved, start, len);
|
ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), reserved, start, len);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
btrfs_free_reserved_data_space_noquota(inode, start, len);
|
btrfs_free_reserved_data_space_noquota(inode, start, len);
|
||||||
else
|
else
|
||||||
|
|
|
@ -3149,7 +3149,7 @@ static int btrfs_zero_range(struct inode *inode,
|
||||||
&cached_state);
|
&cached_state);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
ret = btrfs_qgroup_reserve_data(inode, &data_reserved,
|
ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), &data_reserved,
|
||||||
alloc_start, bytes_to_reserve);
|
alloc_start, bytes_to_reserve);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart,
|
unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart,
|
||||||
|
@ -3322,8 +3322,9 @@ static long btrfs_fallocate(struct file *file, int mode,
|
||||||
free_extent_map(em);
|
free_extent_map(em);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ret = btrfs_qgroup_reserve_data(inode, &data_reserved,
|
ret = btrfs_qgroup_reserve_data(BTRFS_I(inode),
|
||||||
cur_offset, last_byte - cur_offset);
|
&data_reserved, cur_offset,
|
||||||
|
last_byte - cur_offset);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
cur_offset = last_byte;
|
cur_offset = last_byte;
|
||||||
free_extent_map(em);
|
free_extent_map(em);
|
||||||
|
|
|
@ -3425,11 +3425,11 @@ btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info)
|
||||||
* same @reserved, caller must ensure when error happens it's OK
|
* same @reserved, caller must ensure when error happens it's OK
|
||||||
* to free *ALL* reserved space.
|
* to free *ALL* reserved space.
|
||||||
*/
|
*/
|
||||||
int btrfs_qgroup_reserve_data(struct inode *inode,
|
int btrfs_qgroup_reserve_data(struct btrfs_inode *inode,
|
||||||
struct extent_changeset **reserved_ret, u64 start,
|
struct extent_changeset **reserved_ret, u64 start,
|
||||||
u64 len)
|
u64 len)
|
||||||
{
|
{
|
||||||
struct btrfs_root *root = BTRFS_I(inode)->root;
|
struct btrfs_root *root = inode->root;
|
||||||
struct ulist_node *unode;
|
struct ulist_node *unode;
|
||||||
struct ulist_iterator uiter;
|
struct ulist_iterator uiter;
|
||||||
struct extent_changeset *reserved;
|
struct extent_changeset *reserved;
|
||||||
|
@ -3452,12 +3452,12 @@ int btrfs_qgroup_reserve_data(struct inode *inode,
|
||||||
reserved = *reserved_ret;
|
reserved = *reserved_ret;
|
||||||
/* Record already reserved space */
|
/* Record already reserved space */
|
||||||
orig_reserved = reserved->bytes_changed;
|
orig_reserved = reserved->bytes_changed;
|
||||||
ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start,
|
ret = set_record_extent_bits(&inode->io_tree, start,
|
||||||
start + len -1, EXTENT_QGROUP_RESERVED, reserved);
|
start + len -1, EXTENT_QGROUP_RESERVED, reserved);
|
||||||
|
|
||||||
/* Newly reserved space */
|
/* Newly reserved space */
|
||||||
to_reserve = reserved->bytes_changed - orig_reserved;
|
to_reserve = reserved->bytes_changed - orig_reserved;
|
||||||
trace_btrfs_qgroup_reserve_data(inode, start, len,
|
trace_btrfs_qgroup_reserve_data(&inode->vfs_inode, start, len,
|
||||||
to_reserve, QGROUP_RESERVE);
|
to_reserve, QGROUP_RESERVE);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
@ -3471,7 +3471,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode,
|
||||||
/* cleanup *ALL* already reserved ranges */
|
/* cleanup *ALL* already reserved ranges */
|
||||||
ULIST_ITER_INIT(&uiter);
|
ULIST_ITER_INIT(&uiter);
|
||||||
while ((unode = ulist_next(&reserved->range_changed, &uiter)))
|
while ((unode = ulist_next(&reserved->range_changed, &uiter)))
|
||||||
clear_extent_bit(&BTRFS_I(inode)->io_tree, unode->val,
|
clear_extent_bit(&inode->io_tree, unode->val,
|
||||||
unode->aux, EXTENT_QGROUP_RESERVED, 0, 0, NULL);
|
unode->aux, EXTENT_QGROUP_RESERVED, 0, 0, NULL);
|
||||||
/* Also free data bytes of already reserved one */
|
/* Also free data bytes of already reserved one */
|
||||||
btrfs_qgroup_free_refroot(root->fs_info, root->root_key.objectid,
|
btrfs_qgroup_free_refroot(root->fs_info, root->root_key.objectid,
|
||||||
|
|
|
@ -344,7 +344,7 @@ int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* New io_tree based accurate qgroup reserve API */
|
/* New io_tree based accurate qgroup reserve API */
|
||||||
int btrfs_qgroup_reserve_data(struct inode *inode,
|
int btrfs_qgroup_reserve_data(struct btrfs_inode *inode,
|
||||||
struct extent_changeset **reserved, u64 start, u64 len);
|
struct extent_changeset **reserved, u64 start, u64 len);
|
||||||
int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len);
|
int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len);
|
||||||
int btrfs_qgroup_free_data(struct inode *inode,
|
int btrfs_qgroup_free_data(struct inode *inode,
|
||||||
|
|
Loading…
Reference in a new issue