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, 11 insertions, 8 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 7982b830db58..d4edeb8fceb8 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -646,9 +646,10 @@ cfq_choose_req(struct cfq_data *cfqd, struct request *rq1, struct request *rq2,
                 return rq1;
         else if (rq_is_sync(rq2) && !rq_is_sync(rq1))
                 return rq2;
-        if (rq_is_meta(rq1) && !rq_is_meta(rq2))
+        if ((rq1->cmd_flags & REQ_RW_META) && !(rq2->cmd_flags & REQ_RW_META))
                 return rq1;
-        else if (rq_is_meta(rq2) && !rq_is_meta(rq1))
+        else if ((rq2->cmd_flags & REQ_RW_META) &&
+                 !(rq1->cmd_flags & REQ_RW_META))
                 return rq2;
 
         s1 = blk_rq_pos(rq1);
@@ -1484,7 +1485,7 @@ static void cfq_remove_request(struct request *rq)
         cfqq->cfqd->rq_queued--;
         cfq_blkiocg_update_io_remove_stats(&(RQ_CFQG(rq))->blkg,
                                         rq_data_dir(rq), rq_is_sync(rq));
-        if (rq_is_meta(rq)) {
+        if (rq->cmd_flags & REQ_RW_META) {
                 WARN_ON(!cfqq->meta_pending);
                 cfqq->meta_pending--;
         }
@@ -3176,7 +3177,7 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
          * So both queues are sync. Let the new request get disk time if
          * it's a metadata request and the current queue is doing regular IO.
          */
-        if (rq_is_meta(rq) && !cfqq->meta_pending)
+        if ((rq->cmd_flags & REQ_RW_META) && !cfqq->meta_pending)
                 return true;
 
         /*
@@ -3230,7 +3231,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
         struct cfq_io_context *cic = RQ_CIC(rq);
 
         cfqd->rq_queued++;
-        if (rq_is_meta(rq))
+        if (rq->cmd_flags & REQ_RW_META)
                 cfqq->meta_pending++;
 
         cfq_update_io_thinktime(cfqd, cic);
@@ -3365,7 +3366,8 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
         unsigned long now;
 
         now = jiffies;
-        cfq_log_cfqq(cfqd, cfqq, "complete rqnoidle %d", !!rq_noidle(rq));
+        cfq_log_cfqq(cfqd, cfqq, "complete rqnoidle %d",
+                     !!(rq->cmd_flags & REQ_NOIDLE));
 
         cfq_update_hw_tag(cfqd);
 
@@ -3419,11 +3421,12 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
                         cfq_slice_expired(cfqd, 1);
                 else if (sync && cfqq_empty &&
                          !cfq_close_cooperator(cfqd, cfqq)) {
-                        cfqd->noidle_tree_requires_idle |= !rq_noidle(rq);
+                        cfqd->noidle_tree_requires_idle |=
+                                !(rq->cmd_flags & REQ_NOIDLE);
                         /*
                          * Idling is enabled for SYNC_WORKLOAD.
                          * SYNC_NOIDLE_WORKLOAD idles at the end of the tree
-                         * only if we processed at least one !rq_noidle request
+                         * only if we processed at least one !REQ_NOIDLE request
                          */
                         if (cfqd->serving_type == SYNC_WORKLOAD
                             || cfqd->noidle_tree_requires_idle