From 7b718b19ad0472fad3db216b72fd2316c5e62b25 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 5 Jun 2012 13:36:44 +0200 Subject: [PATCH] --- yaml --- r: 311588 b: refs/heads/master c: 27e1f9d1cc87be4e53c6eb7158cafc21c4b85a14 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-cgroup.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 48cdc860dfb3..9425a1908d95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b421d24eac79800ee68905f732300a291f72f00 +refs/heads/master: 27e1f9d1cc87be4e53c6eb7158cafc21c4b85a14 diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c index 4ab7420ba465..e7dee617358e 100644 --- a/trunk/block/blk-cgroup.c +++ b/trunk/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 */