diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-05 21:32:13 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-07 21:41:38 +0200 |
| commit | ba568ea0a2ef9a193ca24874228474ec7ae2ff98 (patch) | |
| tree | 6e8644ecf525f06c987760705fca60063fe90666 /block/cfq-iosched.c | |
| parent | block: prepare mq request creation to use REQ_OPs (diff) | |
| download | linux-ba568ea0a2ef9a193ca24874228474ec7ae2ff98.tar.xz linux-ba568ea0a2ef9a193ca24874228474ec7ae2ff98.zip | |
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>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |