From: Shaohua Li <shaohua.li@intel.com>
Date: Mon, 27 Jun 2011 07:03:48 +0000 (+0200)
Subject: cfq-iosched: make code consistent
X-Git-Tag: v2.6.39.3~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8bb0163f9185d7df8aeda6aca2bef6d38ac10a0;p=karo-tx-linux.git

cfq-iosched: make code consistent

commit 726e99ab88db059fe1422e15376ae404f8c66eb4 upstream.

ioc->ioc_data is rcu protectd, so uses correct API to access it.
This doesn't change any behavior, but just make code consistent.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index c382d7268c3e..bd2fa5fda98c 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3018,7 +3018,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);