Skip to contentSkip to conversation

dm-bufio: clean up rbtree block ordering

PATCH New Mikulas Patocka 1 participant 1 message Jun 2, 2020 Device mapper

lore
Share & tools
lore

Mikulas Patocka

author maintainer
#0 lore raw

PATCH 1/3 dm-bufio: clean up rbtree block ordering

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

This patch reverses the logic, so that i's natural.

---
 drivers/md/dm-bufio.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/md/dm-bufio.c +3 -3
Index: linux-2.6/drivers/md/dm-bufio.c
===================================================================
@@ -256,7 +256,7 @@ static struct dm_buffer *__find(struct d
 		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_cli
 		}
 
 		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);