Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
blk-cgroup: Fix an RCU warning in blkiocg_create()
blk-cgroup: Fix RCU correctness warning in cfq_init_queue()
drbd: don't expose failed local READ to upper layers
+7
-5
+4
-4
block/blk-cgroup.c
+4
-4
block/blk-cgroup.c
···
286
286
static struct cgroup_subsys_state *
287
287
blkiocg_create(struct cgroup_subsys *subsys, struct cgroup *cgroup)
288
288
{
289
-
struct blkio_cgroup *blkcg, *parent_blkcg;
289
+
struct blkio_cgroup *blkcg;
290
+
struct cgroup *parent = cgroup->parent;
290
291
291
-
if (!cgroup->parent) {
292
+
if (!parent) {
292
293
blkcg = &blkio_root_cgroup;
293
294
goto done;
294
295
}
295
296
296
297
/* Currently we do not support hierarchy deeper than two level (0,1) */
297
-
parent_blkcg = cgroup_to_blkio_cgroup(cgroup->parent);
298
-
if (css_depth(&parent_blkcg->css) > 0)
298
+
if (parent != cgroup->top_cgroup)
299
299
return ERR_PTR(-EINVAL);
300
300
301
301
blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL);
+2
block/cfq-iosched.c
+2
block/cfq-iosched.c
···
3694
3694
* to make sure that cfq_put_cfqg() does not try to kfree root group
3695
3695
*/
3696
3696
atomic_set(&cfqg->ref, 1);
3697
+
rcu_read_lock();
3697
3698
blkiocg_add_blkio_group(&blkio_root_cgroup, &cfqg->blkg, (void *)cfqd,
3698
3699
0);
3700
+
rcu_read_unlock();
3699
3701
#endif
3700
3702
/*
3701
3703
* Not strictly needed (since RB_ROOT just clears the node and we
+1
-1
drivers/block/drbd/drbd_worker.c
+1
-1
drivers/block/drbd/drbd_worker.c