Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74514323 authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason
Browse files

Btrfs: remove path arg from btrfs_truncate_free_space_cache 



Not used for anything, and removing it avoids caller's need to
allocate a path structure.

Signed-off-by: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 53645a91

fs/btrfs/extent-tree.c

+1 −2
Original line number Diff line number Diff line
@@ -3197,8 +3197,7 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group, 
		if (ret)

			goto out_put;



		ret = btrfs_truncate_free_space_cache(root, trans, path,

						      inode);

		ret = btrfs_truncate_free_space_cache(root, trans, inode);

		if (ret)

			goto out_put;

	}

fs/btrfs/free-space-cache.c

+0 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ int btrfs_check_trunc_cache_free_space(struct btrfs_root *root, 


int btrfs_truncate_free_space_cache(struct btrfs_root *root,

				    struct btrfs_trans_handle *trans,

				    struct btrfs_path *path,

				    struct inode *inode)

{

	int ret = 0;

fs/btrfs/free-space-cache.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ int btrfs_check_trunc_cache_free_space(struct btrfs_root *root, 
				       struct btrfs_block_rsv *rsv);

int btrfs_truncate_free_space_cache(struct btrfs_root *root,

				    struct btrfs_trans_handle *trans,

				    struct btrfs_path *path,

				    struct inode *inode);

int load_free_space_cache(struct btrfs_fs_info *fs_info,

			  struct btrfs_block_group_cache *block_group);

fs/btrfs/inode-map.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ int btrfs_save_ino_cache(struct btrfs_root *root, 
	}



	if (i_size_read(inode) > 0) {

		ret = btrfs_truncate_free_space_cache(root, trans, path, inode);

		ret = btrfs_truncate_free_space_cache(root, trans, inode);

		if (ret) {

			if (ret != -ENOSPC)

				btrfs_abort_transaction(trans, root, ret);

fs/btrfs/relocation.c

+1 −10
Original line number Diff line number Diff line
@@ -3407,7 +3407,6 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info, 
				    struct inode *inode, u64 ino)

{

	struct btrfs_key key;

	struct btrfs_path *path;

	struct btrfs_root *root = fs_info->tree_root;

	struct btrfs_trans_handle *trans;

	int ret = 0;
@@ -3432,22 +3431,14 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info, 
	if (ret)

		goto out;



	path = btrfs_alloc_path();

	if (!path) {

		ret = -ENOMEM;

		goto out;

	}



	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans)) {

		btrfs_free_path(path);

		ret = PTR_ERR(trans);

		goto out;

	}



	ret = btrfs_truncate_free_space_cache(root, trans, path, inode);

	ret = btrfs_truncate_free_space_cache(root, trans, inode);



	btrfs_free_path(path);

	btrfs_end_transaction(trans, root);

	btrfs_btree_balance_dirty(root);

out: