---

yaml --- r: 311588 b: refs/heads/master c: 27e1f9d h: refs/heads/master v: v3
git-mirror · Jun 6, 2012 · 7b718b1 · 7b718b1
1 parent 202007e
commit 7b718b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 */