From 6b41fd1785f4effe2f3bd40da864415812f5b8c9 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 19:44:03 -0700
Subject: Fix up CFQ scheduler for recent rbtree node shrinkage
The color is now in the low bits of the parent pointer, and initializing
it to 0 happens as part of the whole memset above, so just remove the
unnecessary RB_CLEAR_COLOR.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
block/cfq-iosched.c | 1 -
1 file changed, 1 deletion(-)
(limited to 'block')
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 6200d9b9af2..e2e6ad0a158 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1318,7 +1318,6 @@ cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
if (cic) {
memset(cic, 0, sizeof(*cic));
- RB_CLEAR_COLOR(&cic->rb_node);
cic->last_end_request = jiffies;
INIT_LIST_HEAD(&cic->queue_list);
cic->dtor = cfq_free_io_context;
--
cgit