Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e1f9d1 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarRakesh Iyer <rni@google.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7b421d24

block/blk-cgroup.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -241,10 +241,9 @@ EXPORT_SYMBOL_GPL(blkg_lookup_create); 




static void blkg_destroy(struct blkcg_gq *blkg)

static void blkg_destroy(struct blkcg_gq *blkg)

{

{

	struct request_queue *q = blkg->q;

	struct blkcg *blkcg = blkg->blkcg;

	struct blkcg *blkcg = blkg->blkcg;





	lockdep_assert_held(q->queue_lock);

	lockdep_assert_held(blkg->q->queue_lock);

	lockdep_assert_held(&blkcg->lock);

	lockdep_assert_held(&blkcg->lock);





	/* Something wrong if we are trying to remove same group twice */

	/* Something wrong if we are trying to remove same group twice */