Commit 4ca6f24a authored by Sun YangKai's avatar Sun YangKai Committed by David Sterba
Browse files

btrfs: more trivial BTRFS_PATH_AUTO_FREE conversions 



Trivial pattern for the auto freeing with goto -> return conversions
if possible.

The following cases are considered trivial in this patch:

1. Cases where there are no operations between btrfs_free_path() and the
   function returns.
2. Cases where only simple cleanup operations (such as kfree(), kvfree(),
   clear_bit(), and fs_path_free()) are present between
   btrfs_free_path() and the function return.

Signed-off-by: default avatarSun YangKai <sunk67188@gmail.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c9ff8396

fs/btrfs/raid-stripe-tree.c

+5 −10
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le 
{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *stripe_root = fs_info->stripe_root;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_key key;

	struct extent_buffer *leaf;

	u64 found_start;
@@ -260,7 +260,6 @@ int btrfs_delete_raid_extent(struct btrfs_trans_handle *trans, u64 start, u64 le 
		btrfs_release_path(path);

	}



	btrfs_free_path(path);

	return ret;

}
@@ -269,7 +268,7 @@ static int update_raid_extent_item(struct btrfs_trans_handle *trans, 
				   struct btrfs_stripe_extent *stripe_extent,

				   const size_t item_size)

{

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct extent_buffer *leaf;

	int ret;

	int slot;
@@ -288,7 +287,6 @@ static int update_raid_extent_item(struct btrfs_trans_handle *trans, 


	write_extent_buffer(leaf, stripe_extent, btrfs_item_ptr_offset(leaf, slot),

			    item_size);

	btrfs_free_path(path);



	return ret;

}
@@ -376,7 +374,7 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info, 
	struct btrfs_stripe_extent *stripe_extent;

	struct btrfs_key stripe_key;

	struct btrfs_key found_key;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct extent_buffer *leaf;

	const u64 end = logical + *length;

	int num_stripes;
@@ -402,7 +400,7 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info, 


	ret = btrfs_search_slot(NULL, stripe_root, &stripe_key, path, 0, 0);

	if (ret < 0)

		goto free_path;

		return ret;

	if (ret) {

		if (path->slots[0] != 0)

			path->slots[0]--;
@@ -459,8 +457,7 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info, 
		trace_btrfs_get_raid_extent_offset(fs_info, logical, *length,

						   stripe->physical, devid);



		ret = 0;

		goto free_path;

		return 0;

	}



	/* If we're here, we haven't found the requested devid in the stripe. */
@@ -474,8 +471,6 @@ int btrfs_get_raid_extent_offset(struct btrfs_fs_info *fs_info, 
			  logical, logical + *length, stripe->dev->devid,

			  btrfs_bg_type_to_raid_name(map_type));

	}

free_path:

	btrfs_free_path(path);



	return ret;

}

fs/btrfs/ref-verify.c

+1 −2
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ void btrfs_free_ref_tree_range(struct btrfs_fs_info *fs_info, u64 start, 
int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info)

{

	struct btrfs_root *extent_root;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct extent_buffer *eb;

	int tree_block_level = 0;

	u64 bytenr = 0, num_bytes = 0;
@@ -1021,6 +1021,5 @@ int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info) 
		btrfs_free_ref_cache(fs_info);

		btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY);

	}

	btrfs_free_path(path);

	return ret;

}

fs/btrfs/reflink.c

+1 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode, 
		       const u64 destoff, bool no_time_update)

{

	struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);

	struct btrfs_path *path = NULL;

	BTRFS_PATH_AUTO_FREE(path);

	struct extent_buffer *leaf;

	struct btrfs_trans_handle *trans;

	char *buf = NULL;
@@ -611,7 +611,6 @@ static int btrfs_clone(struct inode *src, struct inode *inode, 
	}



out:

	btrfs_free_path(path);

	kvfree(buf);

	clear_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &BTRFS_I(inode)->runtime_flags);

fs/btrfs/relocation.c

+16 −31
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static int get_new_location(struct inode *reloc_inode, u64 *new_bytenr, 
			    u64 bytenr, u64 num_bytes)

{

	struct btrfs_root *root = BTRFS_I(reloc_inode)->root;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_file_extent_item *fi;

	struct extent_buffer *leaf;

	int ret;
@@ -834,11 +834,9 @@ static int get_new_location(struct inode *reloc_inode, u64 *new_bytenr, 
	ret = btrfs_lookup_file_extent(NULL, root, path,

			btrfs_ino(BTRFS_I(reloc_inode)), bytenr, 0);

	if (ret < 0)

		goto out;

	if (ret > 0) {

		ret = -ENOENT;

		goto out;

	}

		return ret;

	if (ret > 0)

		return -ENOENT;



	leaf = path->nodes[0];

	fi = btrfs_item_ptr(leaf, path->slots[0],
@@ -849,16 +847,11 @@ static int get_new_location(struct inode *reloc_inode, u64 *new_bytenr, 
	       btrfs_file_extent_encryption(leaf, fi) ||

	       btrfs_file_extent_other_encoding(leaf, fi));



	if (num_bytes != btrfs_file_extent_disk_num_bytes(leaf, fi)) {

		ret = -EINVAL;

		goto out;

	}

	if (num_bytes != btrfs_file_extent_disk_num_bytes(leaf, fi))

		return -EINVAL;



	*new_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);

	ret = 0;

out:

	btrfs_free_path(path);

	return ret;

	return 0;

}



/*
@@ -3158,7 +3151,7 @@ static int __add_tree_block(struct reloc_control *rc, 
			    struct rb_root *blocks)

{

	struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_key key;

	int ret;

	bool skinny = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
@@ -3186,7 +3179,7 @@ static int __add_tree_block(struct reloc_control *rc, 
	path->skip_locking = 1;

	ret = btrfs_search_slot(NULL, rc->extent_root, &key, path, 0, 0);

	if (ret < 0)

		goto out;

		return ret;



	if (ret > 0 && skinny) {

		if (path->slots[0]) {
@@ -3213,14 +3206,10 @@ static int __add_tree_block(struct reloc_control *rc, 
	     "tree block extent item (%llu) is not found in extent tree",

		     bytenr);

		WARN_ON(1);

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}



	ret = add_tree_block(rc, &key, path, blocks);

out:

	btrfs_free_path(path);

	return ret;

	return add_tree_block(rc, &key, path, blocks);

}



static int delete_block_group_cache(struct btrfs_block_group *block_group,
@@ -3510,7 +3499,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) 
	struct rb_root blocks = RB_ROOT;

	struct btrfs_key key;

	struct btrfs_trans_handle *trans = NULL;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_extent_item *ei;

	u64 flags;

	int ret;
@@ -3679,14 +3668,13 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) 
	if (ret < 0 && !err)

		err = ret;

	btrfs_free_block_rsv(fs_info, rc->block_rsv);

	btrfs_free_path(path);

	return err;

}



static int __insert_orphan_inode(struct btrfs_trans_handle *trans,

				 struct btrfs_root *root, u64 objectid)

{

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_inode_item *item;

	struct extent_buffer *leaf;

	int ret;
@@ -3697,7 +3685,7 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans, 


	ret = btrfs_insert_empty_inode(trans, root, path, objectid);

	if (ret)

		goto out;

		return ret;



	leaf = path->nodes[0];

	item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_inode_item);
@@ -3707,15 +3695,13 @@ static int __insert_orphan_inode(struct btrfs_trans_handle *trans, 
	btrfs_set_inode_mode(leaf, item, S_IFREG | 0600);

	btrfs_set_inode_flags(leaf, item, BTRFS_INODE_NOCOMPRESS |

					  BTRFS_INODE_PREALLOC);

out:

	btrfs_free_path(path);

	return ret;

	return 0;

}



static void delete_orphan_inode(struct btrfs_trans_handle *trans,

				struct btrfs_root *root, u64 objectid)

{

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_key key;

	int ret = 0;
@@ -3738,7 +3724,6 @@ static void delete_orphan_inode(struct btrfs_trans_handle *trans, 
out:

	if (ret)

		btrfs_abort_transaction(trans, ret);

	btrfs_free_path(path);

}



/*

fs/btrfs/root-tree.c

+20 −34
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root 
		      *item)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct extent_buffer *l;

	int ret;

	int slot;
@@ -143,7 +143,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root 


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

	if (ret < 0)

		goto out;

		return ret;



	if (ret > 0) {

		btrfs_crit(fs_info,
@@ -151,7 +151,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root 
			key->objectid, key->type, key->offset, btrfs_root_id(root));

		ret = -EUCLEAN;

		btrfs_abort_transaction(trans, ret);

		goto out;

		return ret;

	}



	l = path->nodes[0];
@@ -170,20 +170,20 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root 
				-1, 1);

		if (ret < 0) {

			btrfs_abort_transaction(trans, ret);

			goto out;

			return ret;

		}



		ret = btrfs_del_item(trans, root, path);

		if (ret < 0) {

			btrfs_abort_transaction(trans, ret);

			goto out;

			return ret;

		}

		btrfs_release_path(path);

		ret = btrfs_insert_empty_item(trans, root, path,

				key, sizeof(*item));

		if (ret < 0) {

			btrfs_abort_transaction(trans, ret);

			goto out;

			return ret;

		}

		l = path->nodes[0];

		slot = path->slots[0];
@@ -197,8 +197,6 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_set_root_generation_v2(item, btrfs_root_generation(item));



	write_extent_buffer(l, item, ptr, sizeof(*item));

out:

	btrfs_free_path(path);

	return ret;

}
@@ -216,7 +214,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info) 
{

	struct btrfs_root *tree_root = fs_info->tree_root;

	struct extent_buffer *leaf;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_key key;

	struct btrfs_root *root;

	int err = 0;
@@ -309,7 +307,6 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info) 
		btrfs_put_root(root);

	}



	btrfs_free_path(path);

	return err;

}
@@ -318,7 +315,7 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, 
		   const struct btrfs_key *key)

{

	struct btrfs_root *root = trans->fs_info->tree_root;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	int ret;



	path = btrfs_alloc_path();
@@ -326,17 +323,12 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, 
		return -ENOMEM;

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

	if (ret < 0)

		goto out;

	if (ret != 0) {

		return ret;

	if (ret > 0)

		/* The root must exist but we did not find it by the key. */

		ret = -EUCLEAN;

		goto out;

	}

		return -EUCLEAN;



	ret = btrfs_del_item(trans, root, path);

out:

	btrfs_free_path(path);

	return ret;

	return btrfs_del_item(trans, root, path);

}



int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,
@@ -344,7 +336,7 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
		       const struct fscrypt_str *name)

{

	struct btrfs_root *tree_root = trans->fs_info->tree_root;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_root_ref *ref;

	struct extent_buffer *leaf;

	struct btrfs_key key;
@@ -361,7 +353,7 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
again:

	ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1);

	if (ret < 0) {

		goto out;

		return ret;

	} else if (ret == 0) {

		leaf = path->nodes[0];

		ref = btrfs_item_ptr(leaf, path->slots[0],
@@ -369,18 +361,16 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
		ptr = (unsigned long)(ref + 1);

		if ((btrfs_root_ref_dirid(leaf, ref) != dirid) ||

		    (btrfs_root_ref_name_len(leaf, ref) != name->len) ||

		    memcmp_extent_buffer(leaf, name->name, ptr, name->len)) {

			ret = -ENOENT;

			goto out;

		}

		    memcmp_extent_buffer(leaf, name->name, ptr, name->len))

			return -ENOENT;



		*sequence = btrfs_root_ref_sequence(leaf, ref);



		ret = btrfs_del_item(trans, tree_root, path);

		if (ret)

			goto out;

			return ret;

	} else {

		ret = -ENOENT;

		goto out;

		return -ENOENT;

	}



	if (key.type == BTRFS_ROOT_BACKREF_KEY) {
@@ -391,8 +381,6 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
		goto again;

	}



out:

	btrfs_free_path(path);

	return ret;

}
@@ -418,7 +406,7 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
	struct btrfs_root *tree_root = trans->fs_info->tree_root;

	struct btrfs_key key;

	int ret;

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_root_ref *ref;

	struct extent_buffer *leaf;

	unsigned long ptr;
@@ -435,7 +423,6 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
				      sizeof(*ref) + name->len);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		btrfs_free_path(path);

		return ret;

	}
@@ -455,7 +442,6 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
		goto again;

	}



	btrfs_free_path(path);

	return 0;

}