diff options
Diffstat (limited to 'lib/rbtree.c')
-rw-r--r-- | lib/rbtree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbtree.c b/lib/rbtree.c index 0455685f6a73..4b4b29b4577d 100644 --- a/lib/rbtree.c +++ b/lib/rbtree.c | |||
@@ -244,13 +244,13 @@ void rb_erase(struct rb_node *node, struct rb_root *root) | |||
244 | parent = rb_parent(node); | 244 | parent = rb_parent(node); |
245 | color = rb_color(node); | 245 | color = rb_color(node); |
246 | 246 | ||
247 | if (child) | ||
248 | rb_set_parent(child, parent); | ||
249 | if (parent == old) { | 247 | if (parent == old) { |
250 | parent->rb_right = child; | ||
251 | parent = node; | 248 | parent = node; |
252 | } else | 249 | } else { |
250 | if (child) | ||
251 | rb_set_parent(child, parent); | ||
253 | parent->rb_left = child; | 252 | parent->rb_left = child; |
253 | } | ||
254 | 254 | ||
255 | node->rb_parent_color = old->rb_parent_color; | 255 | node->rb_parent_color = old->rb_parent_color; |
256 | node->rb_right = old->rb_right; | 256 | node->rb_right = old->rb_right; |