mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 01:59:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: pass the extent map tree's inode to replace_extent_mapping()

Browse source 
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 <wqu@suse.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Filipe Manana 2024-03-21 16:07:26 +00:00 committed by David Sterba
parent c2fbd812d7
commit 6a3a9113ae
1 changed files with 6 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
fs/btrfs/extent_map.c
View file

@ -470,11 +470,13 @@ void remove_extent_mapping(struct btrfs_inode *inode, struct extent_map *em)
RB_CLEAR_NODE(&em->rb_node); RB_CLEAR_NODE(&em->rb_node);
} }
static void replace_extent_mapping(struct extent_map_tree *tree, static void replace_extent_mapping(struct btrfs_inode *inode,
struct extent_map *cur, struct extent_map *cur,
struct extent_map *new, struct extent_map *new,
int modified) int modified)
{ {
struct extent_map_tree *tree = &inode->extent_tree;
lockdep_assert_held_write(&tree->lock); lockdep_assert_held_write(&tree->lock);
WARN_ON(cur->flags & EXTENT_FLAG_PINNED); 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,
split->generation = gen; split->generation = gen;
split->flags = flags; split->flags = flags;
replace_extent_mapping(em_tree, em, split, modified); replace_extent_mapping(inode, em, split, modified);
free_extent_map(split); free_extent_map(split);
split = split2; split = split2;
split2 = NULL; split2 = NULL;
@ -818,8 +820,7 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end,
} }
if (extent_map_in_tree(em)) { if (extent_map_in_tree(em)) {
replace_extent_mapping(em_tree, em, split, replace_extent_mapping(inode, em, split, modified);
modified);
} else { } else {
int ret; int ret;
@ -977,7 +978,7 @@ int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,
split_pre->flags = flags; split_pre->flags = flags;
split_pre->generation = em->generation; split_pre->generation = em->generation;
replace_extent_mapping(em_tree, em, split_pre, 1); replace_extent_mapping(inode, em, split_pre, 1);
/* /*
* Now we only have an extent_map at: * Now we only have an extent_map at: