瀏覽代碼

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>
Shaohua Li 14 年之前
父節點
當前提交
726e99ab88
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      block/cfq-iosched.c

+ 2 - 1
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);
 	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);
 	radix_tree_delete(&ioc->radix_root, cfqd->cic_index);
 	hlist_del_rcu(&cic->cic_list);
 	hlist_del_rcu(&cic->cic_list);