Commit cfdd4592 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ use btrfs_ino ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d9094414

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -8631,7 +8631,7 @@ void btrfs_destroy_inode(struct inode *inode) 
			btrfs_put_ordered_extent(ordered);

		}

	}

	btrfs_qgroup_check_reserved_leak(inode);

	btrfs_qgroup_check_reserved_leak(BTRFS_I(inode));

	inode_tree_del(inode);

	btrfs_drop_extent_cache(BTRFS_I(inode), 0, (u64)-1, 0);

	btrfs_inode_clear_file_extent_range(BTRFS_I(inode), 0, (u64)-1);

fs/btrfs/qgroup.c

+7 −7
Original line number Diff line number Diff line
@@ -3784,7 +3784,7 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes) 
 * Check qgroup reserved space leaking, normally at destroy inode

 * time

 */

void btrfs_qgroup_check_reserved_leak(struct inode *inode)

void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode)

{

	struct extent_changeset changeset;

	struct ulist_node *unode;
@@ -3792,19 +3792,19 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode) 
	int ret;



	extent_changeset_init(&changeset);

	ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, 0, (u64)-1,

	ret = clear_record_extent_bits(&inode->io_tree, 0, (u64)-1,

			EXTENT_QGROUP_RESERVED, &changeset);



	WARN_ON(ret < 0);

	if (WARN_ON(changeset.bytes_changed)) {

		ULIST_ITER_INIT(&iter);

		while ((unode = ulist_next(&changeset.range_changed, &iter))) {

			btrfs_warn(BTRFS_I(inode)->root->fs_info,

				"leaking qgroup reserved space, ino: %lu, start: %llu, end: %llu",

				inode->i_ino, unode->val, unode->aux);

			btrfs_warn(inode->root->fs_info,

		"leaking qgroup reserved space, ino: %llu, start: %llu, end: %llu",

				btrfs_ino(inode), unode->val, unode->aux);

		}

		btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,

				BTRFS_I(inode)->root->root_key.objectid,

		btrfs_qgroup_free_refroot(inode->root->fs_info,

				inode->root->root_key.objectid,

				changeset.bytes_changed, BTRFS_QGROUP_RSV_DATA);



	}

fs/btrfs/qgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root); 
 */

void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes);



void btrfs_qgroup_check_reserved_leak(struct inode *inode);

void btrfs_qgroup_check_reserved_leak(struct btrfs_inode *inode);



/* btrfs_qgroup_swapped_blocks related functions */

void btrfs_qgroup_init_swapped_blocks(