> + /* avoid allocation failure by clearing NOWAIT */ > + nrq = blk_get_request(rq->q, rq->cmd_flags & ~REQ_NOWAIT, flags); > + if (!nrq) > + return; > + > + blk_rq_copy_request(nrq, rq); > + > + nrq->timeout = rq->timeout; Shouldn't the timeout also go into blk_rq_copy_request? Otherwise this looks good: Reviewed-by: Christoph Hellwig <hch@xxxxxx>