Commit e5344080 authored by David Sterba's avatar David Sterba
Browse files

btrfs: use BTRFS_PATH_AUTO_FREE in run_delayed_extent_op() 



This is the trivial pattern for path auto free, initialize at the
beginning and free at the end with simple goto -> return conversions.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2267214a

fs/btrfs/extent-tree.c

+5 −6
Original line number Diff line number Diff line
@@ -1626,7 +1626,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans, 
	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *root;

	struct btrfs_key key;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_extent_item *ei;

	struct extent_buffer *leaf;

	u32 item_size;
@@ -1657,7 +1657,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans, 
again:

	ret = btrfs_search_slot(trans, root, &key, path, 0, 1);

	if (ret < 0) {

		goto out;

		return ret;

	} else if (ret > 0) {

		if (metadata) {

			if (path->slots[0] > 0) {
@@ -1683,7 +1683,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans, 
			btrfs_err(fs_info,

		  "missing extent item for extent %llu num_bytes %llu level %d",

				  head->bytenr, head->num_bytes, head->level);

			goto out;

			return ret;

		}

	}
@@ -1696,13 +1696,12 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans, 
			  "unexpected extent item size, has %u expect >= %zu",

			  item_size, sizeof(*ei));

		btrfs_abort_transaction(trans, ret);

		goto out;

		return ret;

	}



	ei = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item);

	__run_delayed_extent_op(extent_op, leaf, ei);

out:

	btrfs_free_path(path);



	return ret;

}