btrfs: switch args for comp_*_refs (c7ad7c84) · Commits · 戴 / test

Make it more consistent, we want the inserted ref to be compared against what's already in there. This will make the order go from lowest seq -> highest seq, which will make us more likely to make forward progress if there's a seqlock currently held. Signed-off-by:

Josef Bacik <jbacik@fb.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/delayed-ref.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -40,8 +40,8 @@ struct kmem_cache *btrfs_delayed_extent_op_cachep;
		/*
		* compare two delayed tree backrefs with same bytenr and type
		*/
		static int comp_tree_refs(struct btrfs_delayed_tree_ref *ref2,
		struct btrfs_delayed_tree_ref *ref1)
		static int comp_tree_refs(struct btrfs_delayed_tree_ref *ref1,
		struct btrfs_delayed_tree_ref *ref2)
		{
		if (ref1->node.type == BTRFS_TREE_BLOCK_REF_KEY) {
		if (ref1->root < ref2->root)
		@@ -60,8 +60,8 @@ static int comp_tree_refs(struct btrfs_delayed_tree_ref *ref2,
		/*
		* compare two delayed data backrefs with same bytenr and type
		*/
		static int comp_data_refs(struct btrfs_delayed_data_ref *ref2,
		struct btrfs_delayed_data_ref *ref1)
		static int comp_data_refs(struct btrfs_delayed_data_ref *ref1,
		struct btrfs_delayed_data_ref *ref2)
		{
		if (ref1->node.type == BTRFS_EXTENT_DATA_REF_KEY) {
		if (ref1->root < ref2->root)

Admin message