blk-cgroup: Fix an RCU warning in blkiocg_create()

with CONFIG_PROVE_RCU=y, a warning can be triggered:

# mount -t cgroup -o blkio xxx /mnt
# mkdir /mnt/subgroup

...
kernel/cgroup.c:4442 invoked rcu_dereference_check() without protection!
...

To fix this, we avoid caling css_depth() here, which is a bit simpler
than the original code.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

authored by Li Zefan and committed by Jens Axboe 0341509f dcf097b2

+4 -4
+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);