hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Filipe David Borba Manana 2013-09-20 14:46:51 +01:00 committed by Chris Mason
parent 53645a91f4
commit 7451432394
5 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/extent-tree.c
View File

@ -3197,8 +3197,7 @@ again:
if (ret) if (ret)
goto out_put; goto out_put;
ret = btrfs_truncate_free_space_cache(root, trans, path, ret = btrfs_truncate_free_space_cache(root, trans, inode);
inode);
if (ret) if (ret)
goto out_put; goto out_put;
} }

1
fs/btrfs/free-space-cache.c
View File

@ -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, int btrfs_truncate_free_space_cache(struct btrfs_root *root,
struct btrfs_trans_handle *trans, struct btrfs_trans_handle *trans,
struct btrfs_path *path,
struct inode *inode) struct inode *inode)
{ {
int ret = 0; int ret = 0;

1
fs/btrfs/free-space-cache.h
View File

@ -58,7 +58,6 @@ int btrfs_check_trunc_cache_free_space(struct btrfs_root *root,
struct btrfs_block_rsv *rsv); struct btrfs_block_rsv *rsv);
int btrfs_truncate_free_space_cache(struct btrfs_root *root, int btrfs_truncate_free_space_cache(struct btrfs_root *root,
struct btrfs_trans_handle *trans, struct btrfs_trans_handle *trans,
struct btrfs_path *path,
struct inode *inode); struct inode *inode);
int load_free_space_cache(struct btrfs_fs_info *fs_info, int load_free_space_cache(struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group); struct btrfs_block_group_cache *block_group);

2
fs/btrfs/inode-map.c
View File

@ -466,7 +466,7 @@ again:
} }
if (i_size_read(inode) > 0) { 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) {
if (ret != -ENOSPC) if (ret != -ENOSPC)
btrfs_abort_transaction(trans, root, ret); btrfs_abort_transaction(trans, root, ret);

11
fs/btrfs/relocation.c
View File

@ -3407,7 +3407,6 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info,
struct inode *inode, u64 ino) struct inode *inode, u64 ino)
{ {
struct btrfs_key key; struct btrfs_key key;
struct btrfs_path *path;
struct btrfs_root *root = fs_info->tree_root; struct btrfs_root *root = fs_info->tree_root;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
int ret = 0; int ret = 0;
@ -3432,22 +3431,14 @@ truncate:
if (ret) if (ret)
goto out; goto out;
path = btrfs_alloc_path();
if (!path) {
ret = -ENOMEM;
goto out;
}
trans = btrfs_join_transaction(root); trans = btrfs_join_transaction(root);
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
btrfs_free_path(path);
ret = PTR_ERR(trans); ret = PTR_ERR(trans);
goto out; 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_end_transaction(trans, root);
btrfs_btree_balance_dirty(root); btrfs_btree_balance_dirty(root);
out: out: