Commit 3ba2d364 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

btrfs: reflow btrfs_free_tree_block 



Reflow btrfs_free_tree_block() so that there is one level of indentation
needed.

This patch has no functional changes.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b0d82384

fs/btrfs/extent-tree.c

+50 −49
Original line number Diff line number Diff line
@@ -3447,6 +3447,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 
{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_ref generic_ref = { 0 };

	struct btrfs_block_group *bg;

	int ret;



	btrfs_init_generic_ref(&generic_ref, BTRFS_DROP_DELAYED_REF,
@@ -3460,9 +3461,11 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 
		BUG_ON(ret); /* -ENOMEM */

	}



	if (last_ref && btrfs_header_generation(buf) == trans->transid) {

		struct btrfs_block_group *cache;

		bool must_pin = false;

	if (!last_ref)

		return;



	if (btrfs_header_generation(buf) != trans->transid)

		goto out;



	if (root_id != BTRFS_TREE_LOG_OBJECTID) {

		ret = check_ref_cleanup(trans, buf->start);
@@ -3470,11 +3473,11 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 
			goto out;

	}



		cache = btrfs_lookup_block_group(fs_info, buf->start);

	bg = btrfs_lookup_block_group(fs_info, buf->start);



	if (btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) {

			pin_down_extent(trans, cache, buf->start, buf->len, 1);

			btrfs_put_block_group(cache);

		pin_down_extent(trans, bg, buf->start, buf->len, 1);

		btrfs_put_block_group(bg);

		goto out;

	}
@@ -3494,31 +3497,29 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 
	 * existing log of operations on this node that we have to

	 * contend with.

	 */

		if (test_bit(BTRFS_FS_TREE_MOD_LOG_USERS, &fs_info->flags))

			must_pin = true;



		if (must_pin || btrfs_is_zoned(fs_info)) {

			pin_down_extent(trans, cache, buf->start, buf->len, 1);

			btrfs_put_block_group(cache);

	if (test_bit(BTRFS_FS_TREE_MOD_LOG_USERS, &fs_info->flags)

		     || btrfs_is_zoned(fs_info)) {

		pin_down_extent(trans, bg, buf->start, buf->len, 1);

		btrfs_put_block_group(bg);

		goto out;

	}



	WARN_ON(test_bit(EXTENT_BUFFER_DIRTY, &buf->bflags));



		btrfs_add_free_space(cache, buf->start, buf->len);

		btrfs_free_reserved_bytes(cache, buf->len, 0);

		btrfs_put_block_group(cache);

	btrfs_add_free_space(bg, buf->start, buf->len);

	btrfs_free_reserved_bytes(bg, buf->len, 0);

	btrfs_put_block_group(bg);

	trace_btrfs_reserved_extent_free(fs_info, buf->start, buf->len);

	}



out:

	if (last_ref) {



	/*

	 * Deleting the buffer, clear the corrupt flag since it doesn't

	 * matter anymore.

	 */

	clear_bit(EXTENT_BUFFER_CORRUPT, &buf->bflags);

}

}



/* Can return -ENOMEM */

int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref)