aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 22:44:03 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 22:44:03 -0400
commit6b41fd1785f4effe2f3bd40da864415812f5b8c9 (patch)
tree465b955a8055639828ef64bc963ddead4e44d3c8 /block
parent58dfd9c16e88b9d790e7df8f2c5b03b7887db54c (diff)
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>
Diffstat (limited to 'block')
-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 6200d9b9af28..e2e6ad0a158e 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)
1318 1318
1319 if (cic) { 1319 if (cic) {
1320 memset(cic, 0, sizeof(*cic)); 1320 memset(cic, 0, sizeof(*cic));
1321 RB_CLEAR_COLOR(&cic->rb_node);
1322 cic->last_end_request = jiffies; 1321 cic->last_end_request = jiffies;
1323 INIT_LIST_HEAD(&cic->queue_list); 1322 INIT_LIST_HEAD(&cic->queue_list);
1324 cic->dtor = cfq_free_io_context; 1323 cic->dtor = cfq_free_io_context;