Skip to content

Commit cfdd459

Browse files
lorddoskiaskdave
authored andcommitted
btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode
vfs_inode is used only for the inode number everything else requires btrfs_inode. Signed-off-by: Nikolay Borisov <[email protected]> Reviewed-by: David Sterba <[email protected]> [ use btrfs_ino ] Signed-off-by: David Sterba <[email protected]>
1 parent d909441 commit cfdd459

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

fs/btrfs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8631,7 +8631,7 @@ void btrfs_destroy_inode(struct inode *inode)
86318631
btrfs_put_ordered_extent(ordered);
86328632
}
86338633
}
8634-
btrfs_qgroup_check_reserved_leak(inode);
8634+
btrfs_qgroup_check_reserved_leak(BTRFS_I(inode));
86358635
inode_tree_del(inode);
86368636
btrfs_drop_extent_cache(BTRFS_I(inode), 0, (u64)-1, 0);
86378637
btrfs_inode_clear_file_extent_range(BTRFS_I(inode), 0, (u64)-1);

fs/btrfs/qgroup.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3784,27 +3784,27 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes)
37843784
* Check qgroup reserved space leaking, normally at destroy inode
37853785
* time
37863786
*/
3787-
void btrfs_qgroup_check_reserved_leak(struct inode *inode)
3787+
void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode)
37883788
{
37893789
struct extent_changeset changeset;
37903790
struct ulist_node *unode;
37913791
struct ulist_iterator iter;
37923792
int ret;
37933793

37943794
extent_changeset_init(&changeset);
3795-
ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, 0, (u64)-1,
3795+
ret = clear_record_extent_bits(&inode->io_tree, 0, (u64)-1,
37963796
EXTENT_QGROUP_RESERVED, &changeset);
37973797

37983798
WARN_ON(ret < 0);
37993799
if (WARN_ON(changeset.bytes_changed)) {
38003800
ULIST_ITER_INIT(&iter);
38013801
while ((unode = ulist_next(&changeset.range_changed, &iter))) {
3802-
btrfs_warn(BTRFS_I(inode)->root->fs_info,
3803-
"leaking qgroup reserved space, ino: %lu, start: %llu, end: %llu",
3804-
inode->i_ino, unode->val, unode->aux);
3802+
btrfs_warn(inode->root->fs_info,
3803+
"leaking qgroup reserved space, ino: %llu, start: %llu, end: %llu",
3804+
btrfs_ino(inode), unode->val, unode->aux);
38053805
}
3806-
btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
3807-
BTRFS_I(inode)->root->root_key.objectid,
3806+
btrfs_qgroup_free_refroot(inode->root->fs_info,
3807+
inode->root->root_key.objectid,
38083808
changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);
38093809

38103810
}

fs/btrfs/qgroup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root);
399399
*/
400400
void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes);
401401

402-
void btrfs_qgroup_check_reserved_leak(struct inode *inode);
402+
void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode);
403403

404404
/* btrfs_qgroup_swapped_blocks related functions */
405405
void btrfs_qgroup_init_swapped_blocks(

0 commit comments

Comments
 (0)