Commit f0225cac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

loop: don't try to use AIO for discards

Fix a fat-fingered conversion to the req_op accessors, and also
use a switch statement to make it more obvious what is being checked.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarDave Chinner <david@fromorbit.com>
Fixes: c2df40 ("drivers: use req op accessor");
Reviewed-by: default avatarMing Lei <ming.lei@canonical.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent c0f3fd2b
...@@ -1659,11 +1659,15 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx, ...@@ -1659,11 +1659,15 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
if (lo->lo_state != Lo_bound) if (lo->lo_state != Lo_bound)
return -EIO; return -EIO;
if (lo->use_dio && (req_op(cmd->rq) != REQ_OP_FLUSH || switch (req_op(cmd->rq)) {
req_op(cmd->rq) == REQ_OP_DISCARD)) case REQ_OP_FLUSH:
cmd->use_aio = true; case REQ_OP_DISCARD:
else
cmd->use_aio = false; cmd->use_aio = false;
break;
default:
cmd->use_aio = lo->use_dio;
break;
}
queue_kthread_work(&lo->worker, &cmd->work); queue_kthread_work(&lo->worker, &cmd->work);
......
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