[PATCH block/for-3.5/core] blkcg: drop local variable @q fromblkg_destroy()

From: Tejun Heo
Date: Wed May 16 2012 - 13:09:24 EST


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@xxxxxxxxxx>
Reported-by: Rakesh Iyer <rni@xxxxxxxxxx>
---
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 4465329..3186404 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -271,11 +271,10 @@ 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;
int i;

- 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 */
--
1.7.7.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/