Skip to content

Commit

Permalink
mtip32xx: complete requests from ->timeout
Browse files Browse the repository at this point in the history
By completing the request entirely in the driver we can remove the
BLK_EH_HANDLED return value and thus the split responsibility between the
driver and the block layer that has been causing trouble.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed May 29, 2018
1 parent e5eab01 commit c5fb85b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/block/mtip32xx/mtip32xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -3719,7 +3719,8 @@ static enum blk_eh_timer_return mtip_cmd_timeout(struct request *req,
struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req);

cmd->status = BLK_STS_TIMEOUT;
return BLK_EH_HANDLED;
blk_mq_complete_request(req);
return BLK_EH_DONE;
}

if (test_bit(req->tag, dd->port->cmds_to_issue))
Expand Down

0 comments on commit c5fb85b

Please sign in to comment.