aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2011-06-27 09:03:48 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-06-27 09:36:06 +0200
commit726e99ab88db059fe1422e15376ae404f8c66eb4 (patch)
tree8d9373239aa568f28631e253d9fd07bc78b312c3 /block
parent3181faa85bda3dc3f5e630a1846526c9caaa38e3 (diff)
downloadautogen-726e99ab88db059fe1422e15376ae404f8c66eb4.tar.gz
autogen-726e99ab88db059fe1422e15376ae404f8c66eb4.tar.xz
autogen-726e99ab88db059fe1422e15376ae404f8c66eb4.zip
cfq-iosched: make code consistent
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> Cc: stable@kernel.org # after ab4bd22d Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index fd566c1e261..ae21919f15e 100644
--- a/block/cfq-iosched.c
+++ b/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);