diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-21 13:15:17 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-21 13:15:17 +0100 |
| commit | 3db3a445308b3cee9bbbd8baa6d05081c9532da0 (patch) | |
| tree | 768e3a190df58b0f5f5d4a5c5ade925649e757dd /block/deadline-iosched.c | |
| parent | 7fe1e133bf45b0fe70491ed3d4c5b491feff7aa8 (diff) | |
| download | kernel_samsung_aries-3db3a445308b3cee9bbbd8baa6d05081c9532da0.zip kernel_samsung_aries-3db3a445308b3cee9bbbd8baa6d05081c9532da0.tar.gz kernel_samsung_aries-3db3a445308b3cee9bbbd8baa6d05081c9532da0.tar.bz2 | |
[RBTREE] Change rbtree off-tree marking in I/O schedulers.
They were abusing the rb_color field to mark nodes which weren't currently
on the tree. Fix that to use the same method as eventpoll did -- setting
the parent pointer to point back to itself. And use the appropriate
accessor macros for setting and reading the parent.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'block/deadline-iosched.c')
| -rw-r--r-- | block/deadline-iosched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 399fa1e..06962d8 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c @@ -165,10 +165,9 @@ deadline_find_drq_hash(struct deadline_data *dd, sector_t offset) /* * rb tree support functions */ -#define RB_NONE (2) #define RB_EMPTY(root) ((root)->rb_node == NULL) -#define ON_RB(node) ((node)->rb_color != RB_NONE) -#define RB_CLEAR(node) ((node)->rb_color = RB_NONE) +#define ON_RB(node) (rb_parent(node) != node) +#define RB_CLEAR(node) (rb_set_parent(node, node)) #define rb_entry_drq(node) rb_entry((node), struct deadline_rq, rb_node) #define DRQ_RB_ROOT(dd, drq) (&(dd)->sort_list[rq_data_dir((drq)->request)]) #define rq_rb_key(rq) (rq)->sector |