Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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 ab4bd22
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information...
commit 726e99ab88db059fe1422e15376ae404f8c66eb4 1 parent 3181faa
Shaohua Li authored Jens Axboe committed
Showing with 2 additions and 1 deletion.
  1. +2 −1  block/cfq-iosched.c
View
3  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);
Please sign in to comment.
Something went wrong with that request. Please try again.