Skip to content

Commit e778724

Browse files
fdmananakdave
authored andcommitted
btrfs: pass the extent map tree's inode to setup_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 setup_extent_mapping(). In order to facilitate an upcoming change that adds a shrinker for extent maps, change setup_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 6a3a911 commit e778724

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/btrfs/extent_map.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void clear_em_logging(struct btrfs_inode *inode, struct extent_map *em)
342342
try_merge_map(tree, em);
343343
}
344344

345-
static inline void setup_extent_mapping(struct extent_map_tree *tree,
345+
static inline void setup_extent_mapping(struct btrfs_inode *inode,
346346
struct extent_map *em,
347347
int modified)
348348
{
@@ -351,9 +351,9 @@ static inline void setup_extent_mapping(struct extent_map_tree *tree,
351351
ASSERT(list_empty(&em->list));
352352

353353
if (modified)
354-
list_add(&em->list, &tree->modified_extents);
354+
list_add(&em->list, &inode->extent_tree.modified_extents);
355355
else
356-
try_merge_map(tree, em);
356+
try_merge_map(&inode->extent_tree, em);
357357
}
358358

359359
/*
@@ -381,7 +381,7 @@ static int add_extent_mapping(struct btrfs_inode *inode,
381381
if (ret)
382382
return ret;
383383

384-
setup_extent_mapping(tree, em, modified);
384+
setup_extent_mapping(inode, em, modified);
385385

386386
return 0;
387387
}
@@ -486,7 +486,7 @@ static void replace_extent_mapping(struct btrfs_inode *inode,
486486
rb_replace_node_cached(&cur->rb_node, &new->rb_node, &tree->map);
487487
RB_CLEAR_NODE(&cur->rb_node);
488488

489-
setup_extent_mapping(tree, new, modified);
489+
setup_extent_mapping(inode, new, modified);
490490
}
491491

492492
static struct extent_map *next_extent_map(const struct extent_map *em)

0 commit comments

Comments
 (0)