Permalink
Browse files

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>
  • Loading branch information...
1 parent 6d93592 commit 13589864be74736ca4e6def7376742eb1d2099bf @htejun htejun committed with axboe Jun 5, 2012
Showing with 1 addition and 9 deletions.
  1. +1 −9 block/blk-cgroup.c
View
@@ -177,7 +177,6 @@ EXPORT_SYMBOL_GPL(blkg_lookup);
static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
struct request_queue *q)
- __releases(q->queue_lock) __acquires(q->queue_lock)
{
struct blkcg_gq *blkg;
int ret;
@@ -203,10 +202,6 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
goto err_put;
/* insert */
- ret = radix_tree_preload(GFP_ATOMIC);
- if (ret)
- goto err_free;
-
spin_lock(&blkcg->lock);
ret = radix_tree_insert(&blkcg->blkg_tree, q->id, blkg);
if (likely(!ret)) {
@@ -215,14 +210,11 @@ static struct blkcg_gq *__blkg_lookup_create(struct blkcg *blkcg,
}
spin_unlock(&blkcg->lock);
- radix_tree_preload_end();
-
if (!ret)
return blkg;
-err_free:
- blkg_free(blkg);
err_put:
css_put(&blkcg->css);
+ blkg_free(blkg);
return ERR_PTR(ret);
}

0 comments on commit 1358986

Please sign in to comment.