1 files changed, 14 insertions, 10 deletions

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index b7a0641ead77..116abec7a29c 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -40,16 +40,19 @@ 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)
+                          struct btrfs_delayed_tree_ref *ref1, int type)
 {
-        if (ref1->root < ref2->root)
-                return -1;
-        if (ref1->root > ref2->root)
-                return 1;
-        if (ref1->parent < ref2->parent)
-                return -1;
-        if (ref1->parent > ref2->parent)
-                return 1;
+        if (type == BTRFS_TREE_BLOCK_REF_KEY) {
+                if (ref1->root < ref2->root)
+                        return -1;
+                if (ref1->root > ref2->root)
+                        return 1;
+        } else {
+                if (ref1->parent < ref2->parent)
+                        return -1;
+                if (ref1->parent > ref2->parent)
+                        return 1;
+        }
         return 0;
 }
 
@@ -113,7 +116,8 @@ static int comp_entry(struct btrfs_delayed_ref_node *ref2,
         if (ref1->type == BTRFS_TREE_BLOCK_REF_KEY ||
             ref1->type == BTRFS_SHARED_BLOCK_REF_KEY) {
                 return comp_tree_refs(btrfs_delayed_node_to_tree_ref(ref2),
-                                      btrfs_delayed_node_to_tree_ref(ref1));
+                                      btrfs_delayed_node_to_tree_ref(ref1),
+                                      ref1->type);
         } else if (ref1->type == BTRFS_EXTENT_DATA_REF_KEY ||
                    ref1->type == BTRFS_SHARED_DATA_REF_KEY) {
                 return comp_data_refs(btrfs_delayed_node_to_data_ref(ref2),