X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2Fblk.h;h=79c85f7c9ff50fb33fb89619a744c0f1d3e1686b;hb=c1d4c41f2fdfe66dea957b76d005affba3e56b26;hp=0dce92c37496faf8b187741de6d169869019e9b7;hpb=fb8ec18c316d869271137c97320dbfd2def56569;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/blk.h b/block/blk.h
index 0dce92c..79c85f7 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -70,6 +70,10 @@ void blk_queue_congestion_threshold(struct request_queue *q);
 
 int blk_dev_init(void);
 
+void elv_quiesce_start(struct request_queue *q);
+void elv_quiesce_end(struct request_queue *q);
+
+
 /*
  * Return the threshold (number of used requests) at which the queue is
  * considered to be congested.  It include a little hysteresis to keep the
@@ -102,18 +106,15 @@ static inline int blk_cpu_to_group(int cpu)
 	const struct cpumask *mask = cpu_coregroup_mask(cpu);
 	return cpumask_first(mask);
 #elif defined(CONFIG_SCHED_SMT)
-	return first_cpu(per_cpu(cpu_sibling_map, cpu));
+	return cpumask_first(topology_thread_cpumask(cpu));
 #else
 	return cpu;
 #endif
 }
 
-static inline int blk_do_io_stat(struct request_queue *q)
+static inline int blk_do_io_stat(struct request *rq)
 {
-	if (q)
-		return blk_queue_io_stat(q);
-
-	return 0;
+	return rq->rq_disk && blk_rq_io_stat(rq);
 }
 
 #endif