---

yaml --- r: 190724 b: refs/heads/master c: dcf097b h: refs/heads/master v: v3
git-mirror · May 6, 2010 · 7267668 · 7267668
1 parent 3eb5862
commit 7267668
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a7cc883d6ad95bb89282fc04e917c16d2b5584f
+refs/heads/master: dcf097b247affd8b88ad410a92298590c5600f44
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -3694,8 +3694,10 @@ static void *cfq_init_queue(struct request_queue *q)
 	 * to make sure that cfq_put_cfqg() does not try to kfree root group
 	 */
 	atomic_set(&cfqg->ref, 1);
+	rcu_read_lock();
 	blkiocg_add_blkio_group(&blkio_root_cgroup, &cfqg->blkg, (void *)cfqd,
 					0);
+	rcu_read_unlock();
 #endif
 	/*
 	 * Not strictly needed (since RB_ROOT just clears the node and we