block: remove wrappers for request type/flags

Remove all the trivial wrappers for the cmd_type and cmd_flags fields in
struct requests.  This allows much easier grepping for different request
types instead of unwinding through macros.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 5e7dc9973458..87e4fb7d0e98 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -226,7 +226,7 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req,
 {
         unsigned short max_sectors;
 
-        if (unlikely(blk_pc_request(req)))
+        if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC))
                 max_sectors = queue_max_hw_sectors(q);
         else
                 max_sectors = queue_max_sectors(q);
@@ -250,7 +250,7 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req,
 {
         unsigned short max_sectors;
 
-        if (unlikely(blk_pc_request(req)))
+        if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC))
                 max_sectors = queue_max_hw_sectors(q);
         else
                 max_sectors = queue_max_sectors(q);