Commit 68f32b9c authored by Leo Martins's avatar Leo Martins Committed by David Sterba
Browse files

btrfs: BTRFS_PATH_AUTO_FREE in orphan.c 



All cleanup paths lead to btrfs_path_free so path can be defined with
the automatic freeing callback in the following functions:

- btrfs_insert_orphan_item()
- btrfs_del_orphan_item()

Signed-off-by: default avatarLeo Martins <loemra.dev@gmail.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 45763a0c

fs/btrfs/orphan.c

+7 −17
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ 
int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root, u64 offset)

{

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_key key;

	int ret = 0;



	key.objectid = BTRFS_ORPHAN_OBJECTID;

	key.type = BTRFS_ORPHAN_ITEM_KEY;
@@ -21,16 +20,13 @@ int btrfs_insert_orphan_item(struct btrfs_trans_handle *trans, 
	if (!path)

		return -ENOMEM;



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



	btrfs_free_path(path);

	return ret;

	return btrfs_insert_empty_item(trans, root, path, &key, 0);

}



int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root, u64 offset)

{

	struct btrfs_path *path;

	BTRFS_PATH_AUTO_FREE(path);

	struct btrfs_key key;

	int ret = 0;
@@ -44,15 +40,9 @@ int btrfs_del_orphan_item(struct btrfs_trans_handle *trans, 


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

	if (ret < 0)

		goto out;

	if (ret) { /* JDM: Really? */

		ret = -ENOENT;

		goto out;

	}



	ret = btrfs_del_item(trans, root, path);



out:

	btrfs_free_path(path);

		return ret;

	if (ret)

		return -ENOENT;



	return btrfs_del_item(trans, root, path);

}