Commit 6b41fd17 authored Jun 20, 2006 by Linus Torvalds

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>

parent 58dfd9c1

block/cfq-iosched.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message