summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 19:44:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 19:44:03 -0700
commit6b41fd1785f4effe2f3bd40da864415812f5b8c9 (patch)
tree465b955a8055639828ef64bc963ddead4e44d3c8
parent58dfd9c16e88b9d790e7df8f2c5b03b7887db54c (diff)
downloadop-kernel-dev-6b41fd1785f4effe2f3bd40da864415812f5b8c9.zip
op-kernel-dev-6b41fd1785f4effe2f3bd40da864415812f5b8c9.tar.gz
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>
-rw-r--r--block/cfq-iosched.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 6200d9b..e2e6ad0 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;
OpenPOWER on IntegriCloud