btrfs: relocation: simplify unused logic related to LINK_LOWER

btrfs_backref_link_edge() is always called with the LINK_LOWER argument.
We can simplify it and remove the LINK_LOWER and LINK_UPPER macros
completely.

The last call with LINK_UPPER was removed with commit 0097422c0dfe0a
("btrfs: remove clone_backref_node() from relocation").

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Daniel Vacek <neelx@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index ed497f5f8d1bbf18ae2ec2b5dc52375b1211c4d4..d011c64243c0c47c56e00496957cd11a9bc071ba 100644 (file)
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -3161,18 +3161,14 @@ void btrfs_backref_release_cache(struct btrfs_backref_cache *cache)
        ASSERT(!cache->nr_edges);
 }
 
-void btrfs_backref_link_edge(struct btrfs_backref_edge *edge,
-                            struct btrfs_backref_node *lower,
-                            struct btrfs_backref_node *upper,
-                            int link_which)
+static void btrfs_backref_link_edge(struct btrfs_backref_edge *edge,
+                                   struct btrfs_backref_node *lower,
+                                   struct btrfs_backref_node *upper)
 {
        ASSERT(upper && lower && upper->level == lower->level + 1);
        edge->node[LOWER] = lower;
        edge->node[UPPER] = upper;
-       if (link_which & LINK_LOWER)
-               list_add_tail(&edge->list[LOWER], &lower->upper);
-       if (link_which & LINK_UPPER)
-               list_add_tail(&edge->list[UPPER], &upper->lower);
+       list_add_tail(&edge->list[LOWER], &lower->upper);
 }
 /*
  * Handle direct tree backref
@@ -3242,7 +3238,7 @@ static int handle_direct_tree_backref(struct btrfs_backref_cache *cache,
                ASSERT(upper->checked);
                INIT_LIST_HEAD(&edge->list[UPPER]);
        }
-       btrfs_backref_link_edge(edge, cur, upper, LINK_LOWER);
+       btrfs_backref_link_edge(edge, cur, upper);
        return 0;
 }
 
@@ -3412,7 +3408,7 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans,
                        if (!upper->owner)
                                upper->owner = btrfs_header_owner(eb);
                }
-               btrfs_backref_link_edge(edge, lower, upper, LINK_LOWER);
+               btrfs_backref_link_edge(edge, lower, upper);
 
                if (rb_node) {
                        btrfs_put_root(root);

diff --git a/fs/btrfs/backref.h b/fs/btrfs/backref.h
index 953637115956b99ee2cee6d07a45f14701b88bcb..507cfb35a23cd8882e5127846fa606285767d36f 100644 (file)
--- a/fs/btrfs/backref.h
+++ b/fs/btrfs/backref.h
@@ -423,13 +423,6 @@ struct btrfs_backref_node *btrfs_backref_alloc_node(
 struct btrfs_backref_edge *btrfs_backref_alloc_edge(
                struct btrfs_backref_cache *cache);
 
-#define                LINK_LOWER      (1U << 0)
-#define                LINK_UPPER      (1U << 1)
-
-void btrfs_backref_link_edge(struct btrfs_backref_edge *edge,
-                            struct btrfs_backref_node *lower,
-                            struct btrfs_backref_node *upper,
-                            int link_which);
 void btrfs_backref_free_node(struct btrfs_backref_cache *cache,
                             struct btrfs_backref_node *node);
 void btrfs_backref_free_edge(struct btrfs_backref_cache *cache,