summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-06-05 13:36:44 +0200
committerJens Axboe <axboe@kernel.dk>2012-06-06 08:35:31 +0200
commit27e1f9d1cc87be4e53c6eb7158cafc21c4b85a14 (patch)
treecdb26074805f8635af606bd1b9e92f21481c0d51 /block
parent7b421d24eac79800ee68905f732300a291f72f00 (diff)
downloadop-kernel-dev-27e1f9d1cc87be4e53c6eb7158cafc21c4b85a14.zip
op-kernel-dev-27e1f9d1cc87be4e53c6eb7158cafc21c4b85a14.tar.gz
blkcg: drop local variable @q from blkg_destroy()
blkg_destroy() caches @blkg->q in local variable @q. While there are two places which needs @blkg->q, only lockdep_assert_held() used the local variable leading to unused local variable warning if lockdep is configured out. Drop the local variable and just use @blkg->q directly. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Rakesh Iyer <rni@google.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-cgroup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 4ab7420b..e7dee61 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -241,10 +241,9 @@ EXPORT_SYMBOL_GPL(blkg_lookup_create);
static void blkg_destroy(struct blkcg_gq *blkg)
{
- struct request_queue *q = blkg->q;
struct blkcg *blkcg = blkg->blkcg;
- lockdep_assert_held(q->queue_lock);
+ lockdep_assert_held(blkg->q->queue_lock);
lockdep_assert_held(&blkcg->lock);
/* Something wrong if we are trying to remove same group twice */
OpenPOWER on IntegriCloud