diff options
| author | Tejun Heo <tj@kernel.org> | 2012-06-04 20:40:51 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-06-25 11:53:45 +0200 |
| commit | 13589864be74736ca4e6def7376742eb1d2099bf (patch) | |
| tree | ee115325cb8a41695a79cea7be7d11c2486bbd3f /block | |
| parent | 6d9359280753d2955f86d6411047516a9431eb51 (diff) | |
| download | linux-3.10-13589864be74736ca4e6def7376742eb1d2099bf.tar.gz linux-3.10-13589864be74736ca4e6def7376742eb1d2099bf.tar.bz2 linux-3.10-13589864be74736ca4e6def7376742eb1d2099bf.zip | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index e7dee617358..c3882bbbf0f 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -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); } |