kernel/pm_qos_params.c: Remove unnecessary casts of private_data

[net-next-2.6.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 5ee3d7e72feb0eda7a3abb127f06e82d96142b51..6e7dc87141e48230d0eb82c2bdcf770b0ac581a9 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -161,8 +161,10 @@ static inline int blk_cpu_to_group(int cpu)
  */
 static inline int blk_do_io_stat(struct request *rq)
 {
-       return rq->rq_disk && blk_rq_io_stat(rq) &&
-              (blk_fs_request(rq) || blk_discard_rq(rq));
+       return rq->rq_disk &&
+              (rq->cmd_flags & REQ_IO_STAT) &&
+              (rq->cmd_type == REQ_TYPE_FS ||
+               (rq->cmd_flags & REQ_DISCARD));
 }
 
 #endif