Commit 07c47775 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: add cleanup_ref_head_accounting helper 



We were missing some quota cleanups in check_ref_cleanup, so break the
ref head accounting cleanup into a helper and call that from both
check_ref_cleanup and cleanup_ref_head.  This will hopefully ensure that
we don't screw up accounting in the future for other things that we add.

Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarLiu Bo <bo.liu@linux.alibaba.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d7baffda

fs/btrfs/extent-tree.c

+39 −28
Original line number Diff line number Diff line
@@ -2443,6 +2443,41 @@ static int cleanup_extent_op(struct btrfs_trans_handle *trans, 
	return ret ? ret : 1;

}



static void cleanup_ref_head_accounting(struct btrfs_trans_handle *trans,

					struct btrfs_delayed_ref_head *head)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_delayed_ref_root *delayed_refs =

		&trans->transaction->delayed_refs;



	if (head->total_ref_mod < 0) {

		struct btrfs_space_info *space_info;

		u64 flags;



		if (head->is_data)

			flags = BTRFS_BLOCK_GROUP_DATA;

		else if (head->is_system)

			flags = BTRFS_BLOCK_GROUP_SYSTEM;

		else

			flags = BTRFS_BLOCK_GROUP_METADATA;

		space_info = __find_space_info(fs_info, flags);

		ASSERT(space_info);

		percpu_counter_add_batch(&space_info->total_bytes_pinned,

				   -head->num_bytes,

				   BTRFS_TOTAL_BYTES_PINNED_BATCH);



		if (head->is_data) {

			spin_lock(&delayed_refs->lock);

			delayed_refs->pending_csums -= head->num_bytes;

			spin_unlock(&delayed_refs->lock);

		}

	}



	/* Also free its reserved qgroup space */

	btrfs_qgroup_free_delayed_ref(fs_info, head->qgroup_ref_root,

				      head->qgroup_reserved);

}



static int cleanup_ref_head(struct btrfs_trans_handle *trans,

			    struct btrfs_delayed_ref_head *head)

{
@@ -2478,31 +2513,6 @@ static int cleanup_ref_head(struct btrfs_trans_handle *trans, 
	spin_unlock(&head->lock);

	spin_unlock(&delayed_refs->lock);



	trace_run_delayed_ref_head(fs_info, head, 0);



	if (head->total_ref_mod < 0) {

		struct btrfs_space_info *space_info;

		u64 flags;



		if (head->is_data)

			flags = BTRFS_BLOCK_GROUP_DATA;

		else if (head->is_system)

			flags = BTRFS_BLOCK_GROUP_SYSTEM;

		else

			flags = BTRFS_BLOCK_GROUP_METADATA;

		space_info = __find_space_info(fs_info, flags);

		ASSERT(space_info);

		percpu_counter_add_batch(&space_info->total_bytes_pinned,

				   -head->num_bytes,

				   BTRFS_TOTAL_BYTES_PINNED_BATCH);



		if (head->is_data) {

			spin_lock(&delayed_refs->lock);

			delayed_refs->pending_csums -= head->num_bytes;

			spin_unlock(&delayed_refs->lock);

		}

	}



	if (head->must_insert_reserved) {

		btrfs_pin_extent(fs_info, head->bytenr,

				 head->num_bytes, 1);
@@ -2512,9 +2522,9 @@ static int cleanup_ref_head(struct btrfs_trans_handle *trans, 
		}

	}



	/* Also free its reserved qgroup space */

	btrfs_qgroup_free_delayed_ref(fs_info, head->qgroup_ref_root,

				      head->qgroup_reserved);

	cleanup_ref_head_accounting(trans, head);



	trace_run_delayed_ref_head(fs_info, head, 0);

	btrfs_delayed_ref_unlock(head);

	btrfs_put_delayed_ref_head(head);

	return 0;
@@ -6994,6 +7004,7 @@ static noinline int check_ref_cleanup(struct btrfs_trans_handle *trans, 
	if (head->must_insert_reserved)

		ret = 1;



	cleanup_ref_head_accounting(trans, head);

	mutex_unlock(&head->mutex);

	btrfs_put_delayed_ref_head(head);

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE