X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=block%2Fblk.h;h=24fcaeeaf6202b1e19de9f8e57477b97bccc4065;hb=d7e096b5269c1d479424fee1ee91c5714c2fff78;hp=3ee94358b43d0ba8d1194daaac7d34534e87bfa5;hpb=d855ebec4573e52b93dddf9ac0dbca89203ee0e5;p=linux-2.6-omap-h63xx.git

diff --git a/block/blk.h b/block/blk.h
index 3ee94358b43..24fcaeeaf62 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_quisce_start(struct request_queue *q);
+void elv_quisce_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,14 @@ 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);
+	struct gendisk *disk = rq->rq_disk;
 
-	return 0;
+	if (!disk || !disk->queue)
+		return 0;
+
+	return blk_queue_io_stat(disk->queue) && (rq->cmd_flags & REQ_ELVPRIV);
 }
 
 #endif