Commit 53645a91 authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason

Btrfs: remove duplicated ino cache's inode lookup

We're doing a unnecessary extra lookup of the ino cache's
inode when we already have it (and holding a reference)
during the process of saving the ino cache contents to disk.
Therefore remove this extra lookup.
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 d4b4087c
...@@ -2967,19 +2967,15 @@ int load_free_ino_cache(struct btrfs_fs_info *fs_info, struct btrfs_root *root) ...@@ -2967,19 +2967,15 @@ int load_free_ino_cache(struct btrfs_fs_info *fs_info, struct btrfs_root *root)
int btrfs_write_out_ino_cache(struct btrfs_root *root, int btrfs_write_out_ino_cache(struct btrfs_root *root,
struct btrfs_trans_handle *trans, struct btrfs_trans_handle *trans,
struct btrfs_path *path) struct btrfs_path *path,
struct inode *inode)
{ {
struct btrfs_free_space_ctl *ctl = root->free_ino_ctl; struct btrfs_free_space_ctl *ctl = root->free_ino_ctl;
struct inode *inode;
int ret; int ret;
if (!btrfs_test_opt(root, INODE_MAP_CACHE)) if (!btrfs_test_opt(root, INODE_MAP_CACHE))
return 0; return 0;
inode = lookup_free_ino_inode(root, path);
if (IS_ERR(inode))
return 0;
ret = __btrfs_write_out_cache(root, inode, ctl, NULL, trans, path, 0); ret = __btrfs_write_out_cache(root, inode, ctl, NULL, trans, path, 0);
if (ret) { if (ret) {
btrfs_delalloc_release_metadata(inode, inode->i_size); btrfs_delalloc_release_metadata(inode, inode->i_size);
...@@ -2990,7 +2986,6 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root, ...@@ -2990,7 +2986,6 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root,
#endif #endif
} }
iput(inode);
return ret; return ret;
} }
......
...@@ -76,7 +76,8 @@ int load_free_ino_cache(struct btrfs_fs_info *fs_info, ...@@ -76,7 +76,8 @@ int load_free_ino_cache(struct btrfs_fs_info *fs_info,
struct btrfs_root *root); struct btrfs_root *root);
int btrfs_write_out_ino_cache(struct btrfs_root *root, int btrfs_write_out_ino_cache(struct btrfs_root *root,
struct btrfs_trans_handle *trans, struct btrfs_trans_handle *trans,
struct btrfs_path *path); struct btrfs_path *path,
struct inode *inode);
void btrfs_init_free_space_ctl(struct btrfs_block_group_cache *block_group); void btrfs_init_free_space_ctl(struct btrfs_block_group_cache *block_group);
int __btrfs_add_free_space(struct btrfs_free_space_ctl *ctl, int __btrfs_add_free_space(struct btrfs_free_space_ctl *ctl,
......
...@@ -503,7 +503,7 @@ int btrfs_save_ino_cache(struct btrfs_root *root, ...@@ -503,7 +503,7 @@ int btrfs_save_ino_cache(struct btrfs_root *root,
} }
btrfs_free_reserved_data_space(inode, prealloc); btrfs_free_reserved_data_space(inode, prealloc);
ret = btrfs_write_out_ino_cache(root, trans, path); ret = btrfs_write_out_ino_cache(root, trans, path, inode);
out_put: out_put:
iput(inode); iput(inode);
out_release: out_release:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment