From: Mikulas Patocka <mpatocka@redhat.com>
Date: Tue, 2 Jun 2020 13:34:39 +0000 (+0200)
Subject: dm bufio: clean up rbtree block ordering
X-Git-Tag: v5.8-rc1~125^2~22
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=88f878e58879acfdad03e08776c9802f9cd6f26a;p=linux-block.git

dm bufio: clean up rbtree block ordering

dm-bufio uses unnatural ordering in the rb-tree - blocks with smaller
numbers were put to the right node and blocks with bigger numbers were
put to the left node.

Reverse that logic so that it's natural.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---

diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index 993e624e506c..ff19add97e0b 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -256,7 +256,7 @@ static struct dm_buffer *__find(struct dm_bufio_client *c, sector_t block)
 		if (b->block == block)
 			return b;
 
-		n = (b->block < block) ? n->rb_left : n->rb_right;
+		n = block < b->block ? n->rb_left : n->rb_right;
 	}
 
 	return NULL;
@@ -276,8 +276,8 @@ static void __insert(struct dm_bufio_client *c, struct dm_buffer *b)
 		}
 
 		parent = *new;
-		new = (found->block < b->block) ?
-			&((*new)->rb_left) : &((*new)->rb_right);
+		new = b->block < found->block ?
+			&found->node.rb_left : &found->node.rb_right;
 	}
 
 	rb_link_node(&b->node, parent, new);