1 files changed, 3 insertions, 4 deletions

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;
 }