Commit d8f6cb2b authored by Daniel Vacek's avatar Daniel Vacek Committed by David Sterba
Browse files

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 0097422c
("btrfs: remove clone_backref_node() from relocation").

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDaniel Vacek <neelx@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 593062f6

fs/btrfs/backref.c

+6 −10
Original line number Diff line number Diff line
@@ -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,

static void btrfs_backref_link_edge(struct btrfs_backref_edge *edge,

				    struct btrfs_backref_node *lower,

			     struct btrfs_backref_node *upper,

			     int link_which)

				    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);

}

/*

 * 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);

fs/btrfs/backref.h

+0 −7
Original line number Diff line number Diff line
@@ -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,