diff options
author | Tejun Heo <tj@kernel.org> | 2012-06-05 07:36:44 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-06-06 02:35:31 -0400 |
commit | 27e1f9d1cc87be4e53c6eb7158cafc21c4b85a14 (patch) | |
tree | cdb26074805f8635af606bd1b9e92f21481c0d51 | |
parent | 7b421d24eac79800ee68905f732300a291f72f00 (diff) |
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>
-rw-r--r-- | block/blk-cgroup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 4ab7420ba465..e7dee617358e 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
@@ -241,10 +241,9 @@ EXPORT_SYMBOL_GPL(blkg_lookup_create); | |||
241 | 241 | ||
242 | static void blkg_destroy(struct blkcg_gq *blkg) | 242 | static void blkg_destroy(struct blkcg_gq *blkg) |
243 | { | 243 | { |
244 | struct request_queue *q = blkg->q; | ||
245 | struct blkcg *blkcg = blkg->blkcg; | 244 | struct blkcg *blkcg = blkg->blkcg; |
246 | 245 | ||
247 | lockdep_assert_held(q->queue_lock); | 246 | lockdep_assert_held(blkg->q->queue_lock); |
248 | lockdep_assert_held(&blkcg->lock); | 247 | lockdep_assert_held(&blkcg->lock); |
249 | 248 | ||
250 | /* Something wrong if we are trying to remove same group twice */ | 249 | /* Something wrong if we are trying to remove same group twice */ |