Commit d625fecd authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe

block/kyber: Use the new blk_opf_t type

Use the new blk_opf_t type for arguments that represent a bitwise
combination of a request operation and request flags. Rename those
arguments from 'op' into 'opf'.

This patch does not change any functionality.

Cc: Omar Sandoval <osandov@fb.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-10-bvanassche@acm.orgSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f8359efe
...@@ -195,9 +195,9 @@ struct kyber_hctx_data { ...@@ -195,9 +195,9 @@ struct kyber_hctx_data {
static int kyber_domain_wake(wait_queue_entry_t *wait, unsigned mode, int flags, static int kyber_domain_wake(wait_queue_entry_t *wait, unsigned mode, int flags,
void *key); void *key);
static unsigned int kyber_sched_domain(unsigned int op) static unsigned int kyber_sched_domain(blk_opf_t opf)
{ {
switch (op & REQ_OP_MASK) { switch (opf & REQ_OP_MASK) {
case REQ_OP_READ: case REQ_OP_READ:
return KYBER_READ; return KYBER_READ;
case REQ_OP_WRITE: case REQ_OP_WRITE:
...@@ -553,13 +553,13 @@ static void rq_clear_domain_token(struct kyber_queue_data *kqd, ...@@ -553,13 +553,13 @@ static void rq_clear_domain_token(struct kyber_queue_data *kqd,
} }
} }
static void kyber_limit_depth(unsigned int op, struct blk_mq_alloc_data *data) static void kyber_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)
{ {
/* /*
* We use the scheduler tags as per-hardware queue queueing tokens. * We use the scheduler tags as per-hardware queue queueing tokens.
* Async requests can be limited at this stage. * Async requests can be limited at this stage.
*/ */
if (!op_is_sync(op)) { if (!op_is_sync(opf)) {
struct kyber_queue_data *kqd = data->q->elevator->elevator_data; struct kyber_queue_data *kqd = data->q->elevator->elevator_data;
data->shallow_depth = kqd->async_depth; data->shallow_depth = kqd->async_depth;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment