From a22b593587c2c3e4d3b07cedcde5996461f19a06 Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Mon, 28 May 2018 09:36:47 +0300 Subject: btrfs-progs: Change btrfs_root to btrfs_fs_info argument in btrfs_lookup_extent_info That function really wants an fs_info and not a root. Accidentally, this also makes the kernel/user space signatures to be coherent. Signed-off-by: Nikolay Borisov Reviewed-by: Su Yue Signed-off-by: David Sterba --- extent-tree.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'extent-tree.c') diff --git a/extent-tree.c b/extent-tree.c index d90eb813..2fd4e7a0 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1434,7 +1434,7 @@ int btrfs_extent_post_op(struct btrfs_trans_handle *trans) } int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, - struct btrfs_root *root, u64 bytenr, + struct btrfs_fs_info *fs_info, u64 bytenr, u64 offset, int metadata, u64 *refs, u64 *flags) { struct btrfs_path *path; @@ -1446,9 +1446,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, u64 num_refs; u64 extent_flags; - if (metadata && - !btrfs_fs_incompat(root->fs_info, SKINNY_METADATA)) { - offset = root->fs_info->nodesize; + if (metadata && !btrfs_fs_incompat(fs_info, SKINNY_METADATA)) { + offset = fs_info->nodesize; metadata = 0; } @@ -1465,8 +1464,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, key.type = BTRFS_EXTENT_ITEM_KEY; again: - ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path, - 0, 0); + ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 0); if (ret < 0) goto out; @@ -1483,14 +1481,14 @@ again: path->slots[0]); if (key.objectid == bytenr && key.type == BTRFS_EXTENT_ITEM_KEY && - key.offset == root->fs_info->nodesize) + key.offset == fs_info->nodesize) ret = 0; } if (ret) { btrfs_release_path(path); key.type = BTRFS_EXTENT_ITEM_KEY; - key.offset = root->fs_info->nodesize; + key.offset = fs_info->nodesize; metadata = 0; goto again; } -- cgit v1.2.3