2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------ From: Shaohua Li <[email protected]> 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 <[email protected]> Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- block/cfq-iosched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3018,7 +3018,8 @@ cfq_drop_dead_cic(struct cfq_data *cfqd, 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); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
