---

yaml --- r: 254708 b: refs/heads/master c: 726e99a h: refs/heads/master v: v3
git-mirror · Jun 27, 2011 · 4b25884 · 4b25884
1 parent 4d61f53
commit 4b25884
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3181faa85bda3dc3f5e630a1846526c9caaa38e3
+refs/heads/master: 726e99ab88db059fe1422e15376ae404f8c66eb4
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -3087,7 +3087,8 @@ cfq_drop_dead_cic(struct cfq_data *cfqd, struct io_context *ioc,
 
 	spin_lock_irqsave(&ioc->lock, flags);
 
-	BUG_ON(ioc->ioc_data == cic);
+	BUG_ON(rcu_dereference_check(ioc->ioc_data,
+		lockdep_is_held(&ioc->lock)) == cic);
 
 	radix_tree_delete(&ioc->radix_root, cfqd->cic_index);
 	hlist_del_rcu(&cic->cic_list);