block: reorder request completion functions

[deliverable/linux.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 3ee94358b43d0ba8d1194daaac7d34534e87bfa5..79c85f7c9ff50fb33fb89619a744c0f1d3e1686b 100644 (file)
--- 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
@@ -108,12 +112,9 @@ static inline int blk_cpu_to_group(int 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