Skip to content

Commit 7bc329c

Browse files
Qu Wenruokdave
authored andcommitted
btrfs: qgroup: Return actually freed bytes for qgroup release or free data
btrfs_qgroup_release/free_data() only returns 0 or a negative error number (ENOMEM is the only possible error). This is normally good enough, but sometimes we need the exact byte count it freed/released. Change it to return actually released/freed bytenr number instead of 0 for success. And slightly modify related extent_changeset structure, since in btrfs one no-hole data extent won't be larger than 128M, so "unsigned int" is large enough for the use case. Signed-off-by: Qu Wenruo <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent d1b8b94 commit 7bc329c

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

fs/btrfs/extent-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4347,7 +4347,7 @@ int btrfs_check_data_free_space(struct inode *inode, u64 start, u64 len)
43474347

43484348
/* Use new btrfs_qgroup_reserve_data to reserve precious data space. */
43494349
ret = btrfs_qgroup_reserve_data(inode, start, len);
4350-
if (ret)
4350+
if (ret < 0)
43514351
btrfs_free_reserved_data_space_noquota(inode, start, len);
43524352
return ret;
43534353
}

fs/btrfs/extent_io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ struct extent_buffer {
209209
*/
210210
struct extent_changeset {
211211
/* How many bytes are set/cleared in this operation */
212-
u64 bytes_changed;
212+
unsigned int bytes_changed;
213213

214214
/* Changed ranges */
215215
struct ulist range_changed;

fs/btrfs/qgroup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,6 +2897,7 @@ static int __btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len,
28972897
btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
28982898
BTRFS_I(inode)->root->objectid,
28992899
changeset.bytes_changed);
2900+
ret = changeset.bytes_changed;
29002901
out:
29012902
ulist_release(&changeset.range_changed);
29022903
return ret;

0 commit comments

Comments
 (0)