Commit f0225cac authored Aug 04, 2016 by Christoph Hellwig Committed by Jens Axboe Aug 04, 2016

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: Christoph Hellwig <hch@lst.de>
Reported-by: Dave Chinner <david@fromorbit.com>
Fixes: c2df40 ("drivers: use req op accessor");
Reviewed-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent c0f3fd2b

drivers/block/loop.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -1659,11 +1659,15 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
		if (lo->lo_state != Lo_bound)
		return -EIO;

		if (lo->use_dio && (req_op(cmd->rq) != REQ_OP_FLUSH \|\|
		req_op(cmd->rq) == REQ_OP_DISCARD))
		cmd->use_aio = true;
		else
		switch (req_op(cmd->rq)) {
		case REQ_OP_FLUSH:
		case REQ_OP_DISCARD:
		cmd->use_aio = false;
		break;
		default:
		cmd->use_aio = lo->use_dio;
		break;
		}

		queue_kthread_work(&lo->worker, &cmd->work);