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 --- check/main.c | 10 +++++----- check/mode-lowmem.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'check') diff --git a/check/main.c b/check/main.c index 9a7e6b6d..9e8a83f8 100644 --- a/check/main.c +++ b/check/main.c @@ -1622,9 +1622,9 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, refs = nrefs->refs[*level]; ret = 0; } else { - ret = btrfs_lookup_extent_info(NULL, root, - path->nodes[*level]->start, - *level, 1, &refs, NULL); + ret = btrfs_lookup_extent_info(NULL, fs_info, + path->nodes[*level]->start, + *level, 1, &refs, NULL); if (ret < 0) { err = ret; goto out; @@ -1664,7 +1664,7 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, if (bytenr == nrefs->bytenr[*level - 1]) { refs = nrefs->refs[*level - 1]; } else { - ret = btrfs_lookup_extent_info(NULL, root, bytenr, + ret = btrfs_lookup_extent_info(NULL, fs_info, bytenr, *level - 1, 1, &refs, NULL); if (ret < 0) { refs = 0; @@ -5928,7 +5928,7 @@ static int run_next_block(struct btrfs_root *root, flags = 0; if (!init_extent_tree) { - ret = btrfs_lookup_extent_info(NULL, root, bytenr, + ret = btrfs_lookup_extent_info(NULL, fs_info, bytenr, btrfs_header_level(buf), 1, NULL, &flags); if (ret < 0) { diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 410c5f63..989306f0 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -186,8 +186,8 @@ static int update_nodes_refs(struct btrfs_root *root, u64 bytenr, if (bytenr != (u64)-1) { /* the return value of this function seems a mistake */ - ret = btrfs_lookup_extent_info(NULL, root, bytenr, - level, 1, &refs, &flags); + ret = btrfs_lookup_extent_info(NULL, root->fs_info, bytenr, + level, 1, &refs, &flags); /* temporary fix */ if (ret < 0 && !check_all) return ret; -- cgit v1.2.3