From 7267668264fa892a2ee61aff69829263fbf0e0a0 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Thu, 22 Apr 2010 11:54:52 -0400 Subject: [PATCH] --- yaml --- r: 190724 b: refs/heads/master c: dcf097b247affd8b88ad410a92298590c5600f44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7fe2da1a37fb..f285421c0013 100644 --- 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 index 838834be115b..5f127cfb2e92 100644 --- 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