diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 04:44:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-21 04:44:03 +0200 |
| commit | 6b41fd1785f4effe2f3bd40da864415812f5b8c9 (patch) | |
| tree | 465b955a8055639828ef64bc963ddead4e44d3c8 /block | |
| parent | [FORCEDETH] Fix xmit_lock/netif_tx_lock after merge (diff) | |
| download | linux-6b41fd1785f4effe2f3bd40da864415812f5b8c9.tar.xz linux-6b41fd1785f4effe2f3bd40da864415812f5b8c9.zip | |
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.c | 1 |
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) 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; |