| Message ID | 20180523121941.8632-6-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
On 05/23/2018 02:19 PM, Christoph Hellwig wrote: > 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> > --- > drivers/block/mtip32xx/mtip32xx.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c > index 6df5b0b1517a..beace13effe4 100644 > --- a/drivers/block/mtip32xx/mtip32xx.c > +++ b/drivers/block/mtip32xx/mtip32xx.c > @@ -3720,7 +3720,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)) > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 6df5b0b1517a..beace13effe4 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -3720,7 +3720,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))
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> --- drivers/block/mtip32xx/mtip32xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)