|
@@ -1246,14 +1246,6 @@ int btrfs_check_shared(struct btrfs_trans_handle *trans,
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
-static int inode_ref_info(u64 inum, u64 ioff, struct btrfs_root *fs_root,
|
|
|
|
- struct btrfs_path *path,
|
|
|
|
- struct btrfs_key *found_key)
|
|
|
|
-{
|
|
|
|
- return btrfs_find_item(fs_root, path, inum, ioff,
|
|
|
|
- BTRFS_INODE_REF_KEY, found_key);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid,
|
|
int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid,
|
|
u64 start_off, struct btrfs_path *path,
|
|
u64 start_off, struct btrfs_path *path,
|
|
struct btrfs_inode_extref **ret_extref,
|
|
struct btrfs_inode_extref **ret_extref,
|
|
@@ -1363,7 +1355,8 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,
|
|
btrfs_tree_read_unlock_blocking(eb);
|
|
btrfs_tree_read_unlock_blocking(eb);
|
|
free_extent_buffer(eb);
|
|
free_extent_buffer(eb);
|
|
}
|
|
}
|
|
- ret = inode_ref_info(parent, 0, fs_root, path, &found_key);
|
|
|
|
|
|
+ ret = btrfs_find_item(fs_root, path, parent, 0,
|
|
|
|
+ BTRFS_INODE_REF_KEY, &found_key);
|
|
if (ret > 0)
|
|
if (ret > 0)
|
|
ret = -ENOENT;
|
|
ret = -ENOENT;
|
|
if (ret)
|
|
if (ret)
|
|
@@ -1716,8 +1709,10 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root,
|
|
struct btrfs_key found_key;
|
|
struct btrfs_key found_key;
|
|
|
|
|
|
while (!ret) {
|
|
while (!ret) {
|
|
- ret = inode_ref_info(inum, parent ? parent+1 : 0, fs_root, path,
|
|
|
|
- &found_key);
|
|
|
|
|
|
+ ret = btrfs_find_item(fs_root, path, inum,
|
|
|
|
+ parent ? parent + 1 : 0, BTRFS_INODE_REF_KEY,
|
|
|
|
+ &found_key);
|
|
|
|
+
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
break;
|
|
break;
|
|
if (ret) {
|
|
if (ret) {
|