UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

blkcg: __blkg_lookup_create() doesn't need radix preload 

There's no point in calling radix_tree_preload() if preloading doesn't
use more permissible GFP mask.  Drop preloading from
__blkg_lookup_create().

While at it, drop sparse locking annotation which no longer applies.

v2: Vivek pointed out the odd preload usage.  Instead of updating,
    just drop it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Tejun Heo 2012-06-04 20:40:51 -07:00 committed by Jens Axboe
parent 6d93592807
commit 13589864be
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/blk-cgroup.c
View File

@ -177,7 +177,6 @@ EXPORT_SYMBOL_GPL(blkg_lookup);
static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg, static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
struct request_queue *q) struct request_queue *q)
__releases(q->queue_lock) __acquires(q->queue_lock)
{ {
struct blkcg_gq *blkg; struct blkcg_gq *blkg;
int ret; int ret;
@ -203,10 +202,6 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
goto err_put; goto err_put;
/* insert */ /* insert */
ret = radix_tree_preload(GFP_ATOMIC);
if (ret)
goto err_free;
spin_lock(&blkcg->lock); spin_lock(&blkcg->lock);
ret = radix_tree_insert(&blkcg->blkg_tree, q->id, blkg); ret = radix_tree_insert(&blkcg->blkg_tree, q->id, blkg);
if (likely(!ret)) { if (likely(!ret)) {
@ -215,14 +210,11 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
} }
spin_unlock(&blkcg->lock); spin_unlock(&blkcg->lock);
radix_tree_preload_end();
if (!ret) if (!ret)
return blkg; return blkg;
err_free:
blkg_free(blkg);
err_put: err_put:
css_put(&blkcg->css); css_put(&blkcg->css);
blkg_free(blkg);
return ERR_PTR(ret); return ERR_PTR(ret);
} }