summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-06-05 20:19:05 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-06-05 20:19:05 +0100
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,
struct rb_node
{
- unsigned long rb_parent_colour;
+ unsigned long rb_parent_color;
#define RB_RED 0
#define RB_BLACK 1
struct rb_node *rb_right;
@@ -113,20 +113,20 @@ struct rb_root
};
-#define rb_parent(r) ((struct rb_node *)((r)->rb_parent_colour & ~3))
-#define rb_colour(r) ((r)->rb_parent_colour & 1)
-#define rb_is_red(r) (!rb_colour(r))
-#define rb_is_black(r) rb_colour(r)
-#define rb_set_red(r) do { (r)->rb_parent_colour &= ~1; } while (0)
-#define rb_set_black(r) do { (r)->rb_parent_colour |= 1; } while (0)
+#define rb_parent(r) ((struct rb_node *)((r)->rb_parent_color & ~3))
+#define rb_color(r) ((r)->rb_parent_color & 1)
+#define rb_is_red(r) (!rb_color(r))
+#define rb_is_black(r) rb_color(r)
+#define rb_set_red(r) do { (r)->rb_parent_color &= ~1; } while (0)
+#define rb_set_black(r) do { (r)->rb_parent_color |= 1; } while (0)
static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
{
- rb->rb_parent_colour = (rb->rb_parent_colour & 3) | (unsigned long)p;
+ rb->rb_parent_color = (rb->rb_parent_color & 3) | (unsigned long)p;
}
-static inline void rb_set_colour(struct rb_node *rb, int colour)
+static inline void rb_set_color(struct rb_node *rb, int color)
{
- rb->rb_parent_colour = (rb->rb_parent_colour & ~1) | colour;
+ rb->rb_parent_color = (rb->rb_parent_color & ~1) | color;
}
#define RB_ROOT (struct rb_root) { NULL, }
@@ -148,7 +148,7 @@ extern void rb_replace_node(struct rb_node *victim, struct rb_node *new,
static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
struct rb_node ** rb_link)
{
- node->rb_parent_colour = (unsigned long )parent;
+ node->rb_parent_color = (unsigned long )parent;
node->rb_left = node->rb_right = NULL;
*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,
__rb_rotate_right(other, root);
other = parent->rb_right;
}
- rb_set_colour(other, rb_colour(parent));
+ rb_set_color(other, rb_color(parent));
rb_set_black(parent);
if (other->rb_right)
rb_set_black(other->rb_right);
@@ -207,7 +207,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
__rb_rotate_left(other, root);
other = parent->rb_left;
}
- rb_set_colour(other, rb_colour(parent));
+ rb_set_color(other, rb_color(parent));
rb_set_black(parent);
if (other->rb_left)
rb_set_black(other->rb_left);
@@ -239,7 +239,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
node = left;
child = node->rb_right;
parent = rb_parent(node);
- color = rb_colour(node);
+ color = rb_color(node);
if (child)
rb_set_parent(child, parent);
@@ -249,7 +249,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
} else
parent->rb_left = child;
- node->rb_parent_colour = old->rb_parent_colour;
+ node->rb_parent_color = old->rb_parent_color;
node->rb_right = old->rb_right;
node->rb_left = old->rb_left;
@@ -269,7 +269,7 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
}
parent = rb_parent(node);
- color = rb_colour(node);
+ color = rb_color(node);
if (child)
rb_set_parent(child, parent);