On Mon, Jul 23, 2018 at 10:12:31AM +0200, hch@xxxxxx wrote:
> > diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
> > index 8932ae81a15a..902c30d3c0ed 100644
> > --- a/drivers/scsi/scsi_error.c
> > +++ b/drivers/scsi/scsi_error.c
> > @@ -296,6 +296,8 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
> > rtn = host->hostt->eh_timed_out(scmd);
> >
> > if (rtn == BLK_EH_DONE) {
> > + if (req->q->mq_ops && blk_mq_mark_complete(req))
> > + return rtn;
>
> This looks pretty sensible to me as a band-aid. It just needs a very
> detailed comment explaining what is going on here.
Sounds good, v2 will be sent shortly.
