diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2020-06-03 08:55:18 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-07-27 12:55:32 +0200 |
| commit | 72b7d15bf1e1ee7b71da81e6c5d9afcd2e86c426 (patch) | |
| tree | f4125109b2214b491e4c70bfd3d06a0c733e572e | |
| parent | a0ff10dcc4a5185e9df2e9d5349f8b03cc909b23 (diff) | |
| download | linux-72b7d15bf1e1ee7b71da81e6c5d9afcd2e86c426.tar.gz | |
btrfs: make btrfs_qgroup_release_data take btrfs_inode
It just forwards its argument to __btrfs_qgroup_release_data. Signed-off-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/ordered-data.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/qgroup.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/qgroup.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 7aeaa9fe18a6..49d0d3d528b5 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9643,7 +9643,7 @@ static int insert_prealloc_file_extent(struct btrfs_trans_handle *trans, btrfs_set_stack_file_extent_compression(&stack_fi, BTRFS_COMPRESS_NONE); /* Encryption and other encoding is reserved and all 0 */ - ret = btrfs_qgroup_release_data(inode, file_offset, len); + ret = btrfs_qgroup_release_data(BTRFS_I(inode), file_offset, len); if (ret < 0) return ret; return insert_reserved_file_extent(trans, inode, file_offset, diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 838fec9e245f..855c60d23b4c 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -182,8 +182,7 @@ static int __btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset * The ordered extent has reserved qgroup space, release now * and pass the reserved number for qgroup_record to free. */ - ret = btrfs_qgroup_release_data(&inode->vfs_inode, file_offset, - num_bytes); + ret = btrfs_qgroup_release_data(inode, file_offset, num_bytes); if (ret < 0) return ret; } diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 7795c7616fe8..01a2b03648be 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -3613,9 +3613,9 @@ int btrfs_qgroup_free_data(struct btrfs_inode *inode, * * NOTE: This function may sleep for memory allocation. */ -int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len) +int btrfs_qgroup_release_data(struct btrfs_inode *inode, u64 start, u64 len) { - return __btrfs_qgroup_release_data(BTRFS_I(inode), NULL, start, len, 0); + return __btrfs_qgroup_release_data(inode, NULL, start, len, 0); } static void add_root_meta_rsv(struct btrfs_root *root, int num_bytes, diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h index 0449bfd6fe45..66e80dc91242 100644 --- a/fs/btrfs/qgroup.h +++ b/fs/btrfs/qgroup.h @@ -346,7 +346,7 @@ int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid, /* New io_tree based accurate qgroup reserve API */ int btrfs_qgroup_reserve_data(struct inode *inode, 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 btrfs_inode *inode, u64 start, u64 len); int btrfs_qgroup_free_data(struct btrfs_inode *inode, struct extent_changeset *reserved, u64 start, u64 len); |