Merge branch 'topic/hda' into for-linus

[pandora-kernel.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 24fcaee..79c85f7 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -70,8 +70,8 @@ void blk_queue_congestion_threshold(struct request_queue *q);
 
 int blk_dev_init(void);
 
-void elv_quisce_start(struct request_queue *q);
-void elv_quisce_end(struct request_queue *q);
+void elv_quiesce_start(struct request_queue *q);
+void elv_quiesce_end(struct request_queue *q);
 
 
 /*
@@ -114,12 +114,7 @@ static inline int blk_cpu_to_group(int cpu)
 
 static inline int blk_do_io_stat(struct request *rq)
 {
-       struct gendisk *disk = rq->rq_disk;
-
-       if (!disk || !disk->queue)
-               return 0;
-
-       return blk_queue_io_stat(disk->queue) && (rq->cmd_flags & REQ_ELVPRIV);
+       return rq->rq_disk && blk_rq_io_stat(rq);
 }
 
 #endif