---

yaml --- r: 143971 b: refs/heads/master c: 26a2ac0 h: refs/heads/master i: 143969: 9a45df2 143967: a0c1254 v: v3
git-mirror · Apr 24, 2009 · 2b7aaa9 · 2b7aaa9
1 parent 15f11d5
commit 2b7aaa9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17d5c8ca7572124c9623045f24b0c21d4aa2b47f
+refs/heads/master: 26a2ac009c2b07e1959c8864ca23486c1c485587
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -2446,12 +2446,22 @@ static void cfq_exit_queue(struct elevator_queue *e)
 static void *cfq_init_queue(struct request_queue *q)
 {
 	struct cfq_data *cfqd;
+	int i;
 
 	cfqd = kmalloc_node(sizeof(*cfqd), GFP_KERNEL | __GFP_ZERO, q->node);
 	if (!cfqd)
 		return NULL;
 
 	cfqd->service_tree = CFQ_RB_ROOT;
+
+	/*
+	 * Not strictly needed (since RB_ROOT just clears the node and we
+	 * zeroed cfqd on alloc), but better be safe in case someone decides
+	 * to add magic to the rb code
+	 */
+	for (i = 0; i < CFQ_PRIO_LISTS; i++)
+		cfqd->prio_trees[i] = RB_ROOT;
+
 	INIT_LIST_HEAD(&cfqd->cic_list);
 
 	cfqd->queue = q;