Skip to content

Commit 6a3a911

Browse files
fdmananakdave
authored andcommitted
btrfs: pass the extent map tree's inode to replace_extent_mapping()
Extent maps are always associated to an inode's extent map tree, so there's no need to pass the extent map tree explicitly to replace_extent_mapping(). In order to facilitate an upcoming change that adds a shrinker for extent maps, change replace_extent_mapping() to receive the inode instead of its extent map tree. Reviewed-by: Qu Wenruo <[email protected]> Reviewed-by: Josef Bacik <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent c2fbd81 commit 6a3a911

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

fs/btrfs/extent_map.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,11 +470,13 @@ void remove_extent_mapping(struct btrfs_inode *inode, struct extent_map *em)
470470
RB_CLEAR_NODE(&em->rb_node);
471471
}
472472

473-
static void replace_extent_mapping(struct extent_map_tree *tree,
473+
static void replace_extent_mapping(struct btrfs_inode *inode,
474474
struct extent_map *cur,
475475
struct extent_map *new,
476476
int modified)
477477
{
478+
struct extent_map_tree *tree = &inode->extent_tree;
479+
478480
lockdep_assert_held_write(&tree->lock);
479481

480482
WARN_ON(cur->flags & EXTENT_FLAG_PINNED);
@@ -777,7 +779,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,
777779

778780
split->generation = gen;
779781
split->flags = flags;
780-
replace_extent_mapping(em_tree, em, split, modified);
782+
replace_extent_mapping(inode, em, split, modified);
781783
free_extent_map(split);
782784
split = split2;
783785
split2 = NULL;
@@ -818,8 +820,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,
818820
}
819821

820822
if (extent_map_in_tree(em)) {
821-
replace_extent_mapping(em_tree, em, split,
822-
modified);
823+
replace_extent_mapping(inode, em, split, modified);
823824
} else {
824825
int ret;
825826

@@ -977,7 +978,7 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,
977978
split_pre->flags = flags;
978979
split_pre->generation = em->generation;
979980

980-
replace_extent_mapping(em_tree, em, split_pre, 1);
981+
replace_extent_mapping(inode, em, split_pre, 1);
981982

982983
/*
983984
* Now we only have an extent_map at:

0 commit comments

Comments
 (0)