block: prepare elevator to use REQ_OPs.

This patch converts the elevator code to use separate variables
for the operation and flags, and to check req_op for the REQ_OP.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

3 files changed, 6 insertions, 7 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index a68dc0709299..090e55d7cad7 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1081,7 +1081,7 @@ static struct request *__get_request(struct request_list *rl, int op,
         if (unlikely(blk_queue_dying(q)))
                 return ERR_PTR(-ENODEV);
 
-        may_queue = elv_may_queue(q, op | op_flags);
+        may_queue = elv_may_queue(q, op, op_flags);
         if (may_queue == ELV_MQUEUE_NO)
                 goto rq_starved;
 
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 4a349787bc62..3fcc5986c01d 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -4285,7 +4285,7 @@ static inline int __cfq_may_queue(struct cfq_queue *cfqq)
         return ELV_MQUEUE_MAY;
 }
 
-static int cfq_may_queue(struct request_queue *q, int rw)
+static int cfq_may_queue(struct request_queue *q, int op, int op_flags)
 {
         struct cfq_data *cfqd = q->elevator->elevator_data;
         struct task_struct *tsk = current;
@@ -4302,7 +4302,7 @@ static int cfq_may_queue(struct request_queue *q, int rw)
         if (!cic)
                 return ELV_MQUEUE_MAY;
 
-        cfqq = cic_to_cfqq(cic, rw_is_sync(rw));
+        cfqq = cic_to_cfqq(cic, rw_is_sync(op | op_flags));
         if (cfqq) {
                 cfq_init_prio_data(cfqq, cic);
 
diff --git a/block/elevator.c b/block/elevator.c
index c3555c9c672f..ea9319db50d7 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -366,8 +366,7 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq)
         list_for_each_prev(entry, &q->queue_head) {
                 struct request *pos = list_entry_rq(entry);
 
-                if ((rq->cmd_flags & REQ_DISCARD) !=
-                    (pos->cmd_flags & REQ_DISCARD))
+                if ((req_op(rq) == REQ_OP_DISCARD) != (req_op(pos) == REQ_OP_DISCARD))
                         break;
                 if (rq_data_dir(rq) != rq_data_dir(pos))
                         break;
@@ -717,12 +716,12 @@ void elv_put_request(struct request_queue *q, struct request *rq)
                 e->type->ops.elevator_put_req_fn(rq);
 }
 
-int elv_may_queue(struct request_queue *q, int rw)
+int elv_may_queue(struct request_queue *q, int op, int op_flags)
 {
         struct elevator_queue *e = q->elevator;
 
         if (e->type->ops.elevator_may_queue_fn)
-                return e->type->ops.elevator_may_queue_fn(q, rw);
+                return e->type->ops.elevator_may_queue_fn(q, op, op_flags);
 
         return ELV_MQUEUE_MAY;
 }