aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilipe Manana <fdmanana@gmail.com>2014-03-21 08:46:54 -0400
committerChris Mason <clm@fb.com>2014-06-09 20:20:37 -0400
commitb46ab97bcd4ae7954b3a150f642a82cdd1434f40 (patch)
tree0e4114a0bd2be5e30dc8b1424137970bc3e30c97
parent23f8f9b7caca83d3397b1288a519c6579b7fda88 (diff)
Btrfs: send, avoid unnecessary inode item lookup in the btree
Regardless of whether the caller is interested or not in knowing the inode's generation (dir_gen != NULL), get_first_ref always does a btree lookup to get the inode item. Avoid this useless lookup if dir_gen parameter is NULL (which is in some cases). Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r--fs/btrfs/send.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index c76400dda4df..98e9e0cf7e8e 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -1693,10 +1693,12 @@ static int get_first_ref(struct btrfs_root *root, u64 ino,
1693 goto out; 1693 goto out;
1694 btrfs_release_path(path); 1694 btrfs_release_path(path);
1695 1695
1696 ret = get_inode_info(root, parent_dir, NULL, dir_gen, NULL, NULL, 1696 if (dir_gen) {
1697 NULL, NULL); 1697 ret = get_inode_info(root, parent_dir, NULL, dir_gen, NULL,
1698 if (ret < 0) 1698 NULL, NULL, NULL);
1699 goto out; 1699 if (ret < 0)
1700 goto out;
1701 }
1700 1702
1701 *dir = parent_dir; 1703 *dir = parent_dir;
1702 1704
@@ -1712,13 +1714,12 @@ static int is_first_ref(struct btrfs_root *root,
1712 int ret; 1714 int ret;
1713 struct fs_path *tmp_name; 1715 struct fs_path *tmp_name;
1714 u64 tmp_dir; 1716 u64 tmp_dir;
1715 u64 tmp_dir_gen;
1716 1717
1717 tmp_name = fs_path_alloc(); 1718 tmp_name = fs_path_alloc();
1718 if (!tmp_name) 1719 if (!tmp_name)
1719 return -ENOMEM; 1720 return -ENOMEM;
1720 1721
1721 ret = get_first_ref(root, ino, &tmp_dir, &tmp_dir_gen, tmp_name); 1722 ret = get_first_ref(root, ino, &tmp_dir, NULL, tmp_name);
1722 if (ret < 0) 1723 if (ret < 0)
1723 goto out; 1724 goto out;
1724 1725