Re: [PATCH] Shrink rbtree

[Andrew Morton <akpm@osdl.org>]

David Woodhouse <dwmw2@infradead.org> wrote:
>
> git://git.infradead.org/~dwmw2/rbtree-2.6

include/linux/hrtimer.h: In function `hrtimer_active':
include/linux/hrtimer.h:130: structure has no member named `rb_parent'

Might I cast aspersions upon the quality of your testing?



#define HRTIMER_INACTIVE	((void *)1UL)

...

static inline int hrtimer_active(const struct hrtimer *timer)
{
	return rb_parent(timer->node) != HRTIMER_INACTIVE;
}


So we have somewhat-competing hackery here.

Testing this...

--- devel/include/linux/hrtimer.h~git-rbtree-hrtimer-fix	2006-04-21 18:03:44.000000000 -0700
+++ devel-akpm/include/linux/hrtimer.h	2006-04-21 18:08:02.000000000 -0700
@@ -34,7 +34,7 @@ enum hrtimer_restart {
 	HRTIMER_RESTART,
 };
 
-#define HRTIMER_INACTIVE	((void *)1UL)
+#define HRTIMER_INACTIVE	((void *)-2)
 
 struct hrtimer_base;
 
@@ -127,7 +127,7 @@ extern ktime_t hrtimer_get_next_event(vo
 
 static inline int hrtimer_active(const struct hrtimer *timer)
 {
-	return timer->node.rb_parent != HRTIMER_INACTIVE;
+	return rb_parent(&timer->node) != HRTIMER_INACTIVE;
 }
 
 /* Forward a hrtimer so it expires after now: */
_