btrfs: rename rb_root member of extent_map_tree from map to root

Currently we name the rb_root member of struct extent_map_tree as 'map',
which is odd and confusing. Since it's a root node, rename it to 'root'.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 744e8952abb04d4a3651ee780463f306d5ec8a40..4bc41b0dd7019a0088cf9b6448a2e3f3517118f8 100644 (file)
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -33,7 +33,7 @@ void __cold extent_map_exit(void)
  */
 void extent_map_tree_init(struct extent_map_tree *tree)
 {
-       tree->map = RB_ROOT_CACHED;
+       tree->root = RB_ROOT_CACHED;
        INIT_LIST_HEAD(&tree->modified_extents);
        rwlock_init(&tree->lock);
 }
@@ -265,7 +265,7 @@ static void try_merge_map(struct btrfs_inode *inode, struct extent_map *em)
                        em->generation = max(em->generation, merge->generation);
                        em->flags |= EXTENT_FLAG_MERGED;
 
-                       rb_erase_cached(&merge->rb_node, &tree->map);
+                       rb_erase_cached(&merge->rb_node, &tree->root);
                        RB_CLEAR_NODE(&merge->rb_node);
                        free_extent_map(merge);
                        dec_evictable_extent_maps(inode);
@@ -278,7 +278,7 @@ static void try_merge_map(struct btrfs_inode *inode, struct extent_map *em)
        if (rb && can_merge_extent_map(merge) && mergeable_maps(em, merge)) {
                em->len += merge->len;
                em->block_len += merge->block_len;
-               rb_erase_cached(&merge->rb_node, &tree->map);
+               rb_erase_cached(&merge->rb_node, &tree->root);
                RB_CLEAR_NODE(&merge->rb_node);
                em->generation = max(em->generation, merge->generation);
                em->flags |= EXTENT_FLAG_MERGED;
@@ -389,7 +389,7 @@ static int add_extent_mapping(struct btrfs_inode *inode,
 
        lockdep_assert_held_write(&tree->lock);
 
-       ret = tree_insert(&tree->map, em);
+       ret = tree_insert(&tree->root, em);
        if (ret)
                return ret;
 
@@ -410,7 +410,7 @@ __lookup_extent_mapping(struct extent_map_tree *tree,
        struct rb_node *prev_or_next = NULL;
        u64 end = range_end(start, len);
 
-       rb_node = __tree_search(&tree->map.rb_root, start, &prev_or_next);
+       rb_node = __tree_search(&tree->root.rb_root, start, &prev_or_next);
        if (!rb_node) {
                if (prev_or_next)
                        rb_node = prev_or_next;
@@ -479,7 +479,7 @@ void remove_extent_mapping(struct btrfs_inode *inode, struct extent_map *em)
        lockdep_assert_held_write(&tree->lock);
 
        WARN_ON(em->flags & EXTENT_FLAG_PINNED);
-       rb_erase_cached(&em->rb_node, &tree->map);
+       rb_erase_cached(&em->rb_node, &tree->root);
        if (!(em->flags & EXTENT_FLAG_LOGGING))
                list_del_init(&em->list);
        RB_CLEAR_NODE(&em->rb_node);
@@ -500,7 +500,7 @@ static void replace_extent_mapping(struct btrfs_inode *inode,
        ASSERT(extent_map_in_tree(cur));
        if (!(cur->flags & EXTENT_FLAG_LOGGING))
                list_del_init(&cur->list);
-       rb_replace_node_cached(&cur->rb_node, &new->rb_node, &tree->map);
+       rb_replace_node_cached(&cur->rb_node, &new->rb_node, &tree->root);
        RB_CLEAR_NODE(&cur->rb_node);
 
        setup_extent_mapping(inode, new, modified);
@@ -659,11 +659,11 @@ static void drop_all_extent_maps_fast(struct btrfs_inode *inode)
        struct extent_map_tree *tree = &inode->extent_tree;
 
        write_lock(&tree->lock);
-       while (!RB_EMPTY_ROOT(&tree->map.rb_root)) {
+       while (!RB_EMPTY_ROOT(&tree->root.rb_root)) {
                struct extent_map *em;
                struct rb_node *node;
 
-               node = rb_first_cached(&tree->map);
+               node = rb_first_cached(&tree->root);
                em = rb_entry(node, struct extent_map, rb_node);
                em->flags &= ~(EXTENT_FLAG_PINNED | EXTENT_FLAG_LOGGING);
                remove_extent_mapping(inode, em);
@@ -1058,7 +1058,7 @@ static long btrfs_scan_inode(struct btrfs_inode *inode, long *scanned, long nr_t
                return 0;
 
        write_lock(&tree->lock);
-       node = rb_first_cached(&tree->map);
+       node = rb_first_cached(&tree->root);
        while (node) {
                struct extent_map *em;
 
@@ -1094,7 +1094,7 @@ next:
                 * lock and took it again.
                 */
                if (cond_resched_rwlock_write(&tree->lock))
-                       node = rb_first_cached(&tree->map);
+                       node = rb_first_cached(&tree->root);
        }
        write_unlock(&tree->lock);
        up_read(&inode->i_mmap_lock);

diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h
index 6d587111f73a010e257bab7384db8ec85d5275d4..9c0793888d1347fa9caa460b68625fef6d5766a8 100644 (file)
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -115,7 +115,7 @@ struct extent_map {
 };
 
 struct extent_map_tree {
-       struct rb_root_cached map;
+       struct rb_root_cached root;
        struct list_head modified_extents;
        rwlock_t lock;
 };

diff --git a/fs/btrfs/tests/extent-map-tests.c b/fs/btrfs/tests/extent-map-tests.c
index ba36794ba2d51a1c1dbbaf970eda879e503775bf..075e6930acda56bc677254b5d67860580597aa77 100644 (file)
--- a/fs/btrfs/tests/extent-map-tests.c
+++ b/fs/btrfs/tests/extent-map-tests.c
@@ -19,8 +19,8 @@ static int free_extent_map_tree(struct btrfs_inode *inode)
        int ret = 0;
 
        write_lock(&em_tree->lock);
-       while (!RB_EMPTY_ROOT(&em_tree->map.rb_root)) {
-               node = rb_first_cached(&em_tree->map);
+       while (!RB_EMPTY_ROOT(&em_tree->root.rb_root)) {
+               node = rb_first_cached(&em_tree->root);
                em = rb_entry(node, struct extent_map, rb_node);
                remove_extent_mapping(inode, em);
 
@@ -551,7 +551,7 @@ static int validate_range(struct extent_map_tree *em_tree, int index)
        struct rb_node *n;
        int i;
 
-       for (i = 0, n = rb_first_cached(&em_tree->map);
+       for (i = 0, n = rb_first_cached(&em_tree->root);
             valid_ranges[index][i].len && n;
             i++, n = rb_next(n)) {
                struct extent_map *entry = rb_entry(n, struct extent_map, rb_node);