Commit 4c199a93a2d36b277a9fd209a0f2793f8460a215

Authored by Michel Lespinasse
Committed by Linus Torvalds
1 parent 1457d28778

rbtree: empty nodes have no color

Empty nodes have no color.  We can make use of this property to simplify
the code emitted by the RB_EMPTY_NODE and RB_CLEAR_NODE macros.  Also,
we can get rid of the rb_init_node function which had been introduced by
commit 88d19cf37952 ("timers: Add rb_init_node() to allow for stack
allocated rb nodes") to avoid some issue with the empty node's color not
being initialized.

I'm not sure what the RB_EMPTY_NODE checks in rb_prev() / rb_next() are
doing there, though.  axboe introduced them in commit 10fd48f2376d
("rbtree: fixed reversed RB_EMPTY_NODE and rb_next/prev").  The way I
see it, the 'empty node' abstraction is only used by rbtree users to
flag nodes that they haven't inserted in any rbtree, so asking the
predecessor or successor of such nodes doesn't make any sense.

One final rb_init_node() caller was recently added in sysctl code to
implement faster sysctl name lookups.  This code doesn't make use of
RB_EMPTY_NODE at all, and from what I could see it only called
rb_init_node() under the mistaken assumption that such initialization was
required before node insertion.

[sfr@canb.auug.org.au: fix net/ceph/osd_client.c build]
Signed-off-by: Michel Lespinasse <walken@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Daniel Santos <daniel.santos@pobox.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 5 changed files with 9 additions and 17 deletions Side-by-side Diff

fs/proc/proc_sysctl.c
... ... @@ -168,10 +168,8 @@
168 168 head->node = node;
169 169 if (node) {
170 170 struct ctl_table *entry;
171   - for (entry = table; entry->procname; entry++, node++) {
172   - rb_init_node(&node->node);
  171 + for (entry = table; entry->procname; entry++, node++)
173 172 node->header = head;
174   - }
175 173 }
176 174 }
177 175  
include/linux/rbtree.h
... ... @@ -67,17 +67,12 @@
67 67 #define RB_ROOT (struct rb_root) { NULL, }
68 68 #define rb_entry(ptr, type, member) container_of(ptr, type, member)
69 69  
70   -#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL)
71   -#define RB_EMPTY_NODE(node) (rb_parent(node) == node)
72   -#define RB_CLEAR_NODE(node) (rb_set_parent(node, node))
  70 +#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL)
73 71  
74   -static inline void rb_init_node(struct rb_node *rb)
75   -{
76   - rb->rb_parent_color = 0;
77   - rb->rb_right = NULL;
78   - rb->rb_left = NULL;
79   - RB_CLEAR_NODE(rb);
80   -}
  72 +/* 'empty' nodes are nodes that are known not to be inserted in an rbree */
  73 +#define RB_EMPTY_NODE(node) ((node)->rb_parent_color == (unsigned long)(node))
  74 +#define RB_CLEAR_NODE(node) ((node)->rb_parent_color = (unsigned long)(node))
  75 +
81 76  
82 77 extern void rb_insert_color(struct rb_node *, struct rb_root *);
83 78 extern void rb_erase(struct rb_node *, struct rb_root *);
include/linux/timerqueue.h
... ... @@ -39,7 +39,7 @@
39 39  
40 40 static inline void timerqueue_init(struct timerqueue_node *node)
41 41 {
42   - rb_init_node(&node->node);
  42 + RB_CLEAR_NODE(&node->node);
43 43 }
44 44  
45 45 static inline void timerqueue_init_head(struct timerqueue_head *head)
... ... @@ -387,7 +387,7 @@
387 387 {
388 388 struct rb_node *parent;
389 389  
390   - if (rb_parent(node) == node)
  390 + if (RB_EMPTY_NODE(node))
391 391 return NULL;
392 392  
393 393 /* If we have a right-hand child, go down and then left as far
... ... @@ -416,7 +416,7 @@
416 416 {
417 417 struct rb_node *parent;
418 418  
419   - if (rb_parent(node) == node)
  419 + if (RB_EMPTY_NODE(node))
420 420 return NULL;
421 421  
422 422 /* If we have a left-hand child, go down and then right as far
net/ceph/osd_client.c
... ... @@ -221,7 +221,6 @@
221 221 kref_init(&req->r_kref);
222 222 init_completion(&req->r_completion);
223 223 init_completion(&req->r_safe_completion);
224   - rb_init_node(&req->r_node);
225 224 INIT_LIST_HEAD(&req->r_unsafe_item);
226 225 INIT_LIST_HEAD(&req->r_linger_item);
227 226 INIT_LIST_HEAD(&req->r_linger_osd);