diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2011-06-27 09:03:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-08 23:15:24 -0700 |
| commit | a8bb0163f9185d7df8aeda6aca2bef6d38ac10a0 (patch) | |
| tree | 02e206621eef3db68feb3630d6a38a5e98563643 | |
| parent | 3ad80528ba9a8d2e69aba2e110dc875765196bac (diff) | |
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>
| -rw-r--r-- | block/cfq-iosched.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |