aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-06-05 15:19:05 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-06-05 15:19:05 -0400
commit2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 (patch)
treea5b5e3ec2be7f9497dc991b7c7914df6fde27b98
parentaa783a8f31c79f493bd49ba926b171b79b9839fb (diff)
[RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
Since rb_insert_color() is part of the _public_ API, while the others are purely internal, switch to be consistent with that. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--include/linux/rbtree.h22
-rw-r--r--lib/rbtree.c10
2 files changed, 16 insertions, 16 deletions
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 3cc30b0ab828..f37006f21664 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -99,7 +99,7 @@ static inline struct page * rb_insert_page_cache(struct inode * inode,
99 99
100struct rb_node 100struct rb_node
101{ 101{
102 unsigned long rb_parent_colour; 102 unsigned long rb_parent_color;
103#define RB_RED 0 103#define RB_RED 0
104#define RB_BLACK 1 104#define RB_BLACK 1
105 struct rb_node *rb_right; 105 struct rb_node *rb_right;
@@ -113,20 +113,20 @@ struct rb_root
113}; 113};
114 114
115 115
116#define rb_parent(r) ((struct rb_node *)((r)->rb_parent_colour & ~3)) 116#define rb_parent(r) ((struct rb_node *)((r)->rb_parent_color & ~3))
117#define rb_colour(r) ((r)->rb_parent_colour & 1) 117#define rb_color(r) ((r)->rb_parent_color & 1)
118#define rb_is_red(r) (!rb_colour(r)) 118#define rb_is_red(r) (!rb_color(r))
119#define rb_is_black(r) rb_colour(r) 119#define rb_is_black(r) rb_color(r)
120#define rb_set_red(r) do { (r)->rb_parent_colour &= ~1; } while (0) 120#define rb_set_red(r) do { (r)->rb_parent_color &= ~1; } while (0)
121#define rb_set_black(r) do { (r)->rb_parent_colour |= 1; } while (0) 121#define rb_set_black(r) do { (r)->rb_parent_color |= 1; } while (0)
122 122
123static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p) 123static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
124{ 124{
125 rb->rb_parent_colour = (rb->rb_parent_colour & 3) | (unsigned long)p; 125 rb->rb_parent_color = (rb->rb_parent_color & 3) | (unsigned long)p;
126} 126}
127static inline void rb_set_colour(struct rb_node *rb, int colour) 127static inline void rb_set_color(struct rb_node *rb, int color)
128{ 128{
129 rb->rb_parent_colour = (rb->rb_parent_colour & ~1) | colour; 129 rb->rb_parent_color = (rb->rb_parent_color & ~1) | color;
130} 130}
131 131
132#define RB_ROOT (struct rb_root) { NULL, } 132#define RB_ROOT (struct rb_root) { NULL, }
@@ -148,7 +148,7 @@ extern void rb_replace_node(struct rb_node *victim, struct rb_node *new,
148static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, 148static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
149 struct rb_node ** rb_link) 149 struct rb_node ** rb_link)
150{ 150{
151 node->rb_parent_colour = (unsigned long )parent; 151 node->rb_parent_color = (unsigned long )parent;
152 node->rb_left = node->rb_right = NULL; 152 node->rb_left = node->rb_right = NULL;
153 153
154 *rb_link = node; 154 *rb_link = node;
diff --git a/lib/rbtree.c b/lib/rbtree.c
index 4a7173cad149..1e55ba1c2edf 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -170,7 +170,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
170 __rb_rotate_right(other, root); 170 __rb_rotate_right(other, root);
171 other = parent->rb_right; 171 other = parent->rb_right;
172 } 172 }
173 rb_set_colour(other, rb_colour(parent)); 173 rb_set_color(other, rb_color(parent));
174 rb_set_black(parent); 174 rb_set_black(parent);
175 if (other->rb_right) 175 if (other->rb_right)
176 rb_set_black(other->rb_right); 176 rb_set_black(other->rb_right);
@@ -207,7 +207,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
207 __rb_rotate_left(other, root); 207 __rb_rotate_left(other, root);
208 other = parent->rb_left; 208 other = parent->rb_left;
209 } 209 }
210 rb_set_colour(other, rb_colour(parent)); 210 rb_set_color(other, rb_color(parent));
211 rb_set_black(parent); 211 rb_set_black(parent);
212 if (other->rb_left) 212 if (other->rb_left)
213 rb_set_black(other->rb_left); 213 rb_set_black(other->rb_left);
@@ -239,7 +239,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
239 node = left; 239 node = left;
240 child = node->rb_right; 240 child = node->rb_right;
241 parent = rb_parent(node); 241 parent = rb_parent(node);
242 color = rb_colour(node); 242 color = rb_color(node);
243 243
244 if (child) 244 if (child)
245 rb_set_parent(child, parent); 245 rb_set_parent(child, parent);
@@ -249,7 +249,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
249 } else 249 } else
250 parent->rb_left = child; 250 parent->rb_left = child;
251 251
252 node->rb_parent_colour = old->rb_parent_colour; 252 node->rb_parent_color = old->rb_parent_color;
253 node->rb_right = old->rb_right; 253 node->rb_right = old->rb_right;
254 node->rb_left = old->rb_left; 254 node->rb_left = old->rb_left;
255 255
@@ -269,7 +269,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
269 } 269 }
270 270
271 parent = rb_parent(node); 271 parent = rb_parent(node);
272 color = rb_colour(node); 272 color = rb_color(node);
273 273
274 if (child) 274 if (child)
275 rb_set_parent(child, parent); 275 rb_set_parent(child, parent);