From 4b25884ef8e5dac4d285baa2c353616e03e561de Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Mon, 27 Jun 2011 09:03:48 +0200
Subject: [PATCH] --- yaml --- r: 254708 b: refs/heads/master c:
 726e99ab88db059fe1422e15376ae404f8c66eb4 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d8c8b477f17..f297d28c2a5b 100644
--- 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
index fd566c1e2617..ae21919f15e1 100644
--- 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);