Skip to content

Commit a22b593

Browse files
lorddoskiaskdave
authored andcommitted
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 <nborisov@suse.com> Reviewed-by: Su Yue <suy.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 12e2280 commit a22b593

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

check/main.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1622,9 +1622,9 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path,
16221622
refs = nrefs->refs[*level];
16231623
ret = 0;
16241624
} else {
1625-
ret = btrfs_lookup_extent_info(NULL, root,
1626-
path->nodes[*level]->start,
1627-
*level, 1, &refs, NULL);
1625+
ret = btrfs_lookup_extent_info(NULL, fs_info,
1626+
path->nodes[*level]->start,
1627+
*level, 1, &refs, NULL);
16281628
if (ret < 0) {
16291629
err = ret;
16301630
goto out;
@@ -1664,7 +1664,7 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path,
16641664
if (bytenr == nrefs->bytenr[*level - 1]) {
16651665
refs = nrefs->refs[*level - 1];
16661666
} else {
1667-
ret = btrfs_lookup_extent_info(NULL, root, bytenr,
1667+
ret = btrfs_lookup_extent_info(NULL, fs_info, bytenr,
16681668
*level - 1, 1, &refs, NULL);
16691669
if (ret < 0) {
16701670
refs = 0;
@@ -5928,7 +5928,7 @@ static int run_next_block(struct btrfs_root *root,
59285928

59295929
flags = 0;
59305930
if (!init_extent_tree) {
5931-
ret = btrfs_lookup_extent_info(NULL, root, bytenr,
5931+
ret = btrfs_lookup_extent_info(NULL, fs_info, bytenr,
59325932
btrfs_header_level(buf), 1, NULL,
59335933
&flags);
59345934
if (ret < 0) {

check/mode-lowmem.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ static int update_nodes_refs(struct btrfs_root *root, u64 bytenr,
186186

187187
if (bytenr != (u64)-1) {
188188
/* the return value of this function seems a mistake */
189-
ret = btrfs_lookup_extent_info(NULL, root, bytenr,
190-
level, 1, &refs, &flags);
189+
ret = btrfs_lookup_extent_info(NULL, root->fs_info, bytenr,
190+
level, 1, &refs, &flags);
191191
/* temporary fix */
192192
if (ret < 0 && !check_all)
193193
return ret;

ctree.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
192192
*/
193193

194194
if (btrfs_block_can_be_shared(root, buf)) {
195-
ret = btrfs_lookup_extent_info(trans, root, buf->start,
195+
ret = btrfs_lookup_extent_info(trans, trans->fs_info,
196+
buf->start,
196197
btrfs_header_level(buf), 1,
197198
&refs, &flags);
198199
BUG_ON(ret);

ctree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2517,7 +2517,7 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
25172517
struct btrfs_disk_key *key, int level,
25182518
u64 hint, u64 empty_size);
25192519
int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
2520-
struct btrfs_root *root, u64 bytenr,
2520+
struct btrfs_fs_info *fs_info, u64 bytenr,
25212521
u64 offset, int metadata, u64 *refs, u64 *flags);
25222522
int btrfs_set_block_flags(struct btrfs_trans_handle *trans,
25232523
struct btrfs_root *root,

extent-tree.c

+6-8
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ int btrfs_extent_post_op(struct btrfs_trans_handle *trans)
14341434
}
14351435

14361436
int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
1437-
struct btrfs_root *root, u64 bytenr,
1437+
struct btrfs_fs_info *fs_info, u64 bytenr,
14381438
u64 offset, int metadata, u64 *refs, u64 *flags)
14391439
{
14401440
struct btrfs_path *path;
@@ -1446,9 +1446,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
14461446
u64 num_refs;
14471447
u64 extent_flags;
14481448

1449-
if (metadata &&
1450-
!btrfs_fs_incompat(root->fs_info, SKINNY_METADATA)) {
1451-
offset = root->fs_info->nodesize;
1449+
if (metadata && !btrfs_fs_incompat(fs_info, SKINNY_METADATA)) {
1450+
offset = fs_info->nodesize;
14521451
metadata = 0;
14531452
}
14541453

@@ -1465,8 +1464,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
14651464
key.type = BTRFS_EXTENT_ITEM_KEY;
14661465

14671466
again:
1468-
ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path,
1469-
0, 0);
1467+
ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 0);
14701468
if (ret < 0)
14711469
goto out;
14721470

@@ -1483,14 +1481,14 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
14831481
path->slots[0]);
14841482
if (key.objectid == bytenr &&
14851483
key.type == BTRFS_EXTENT_ITEM_KEY &&
1486-
key.offset == root->fs_info->nodesize)
1484+
key.offset == fs_info->nodesize)
14871485
ret = 0;
14881486
}
14891487

14901488
if (ret) {
14911489
btrfs_release_path(path);
14921490
key.type = BTRFS_EXTENT_ITEM_KEY;
1493-
key.offset = root->fs_info->nodesize;
1491+
key.offset = fs_info->nodesize;
14941492
metadata = 0;
14951493
goto again;
14961494
}

0 commit comments

Comments
 (0)