File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -1249,8 +1249,8 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
12491249 dev_warn_ratelimited (dev -> ctrl .device ,
12501250 "I/O %d QID %d timeout, disable controller\n" ,
12511251 req -> tag , nvmeq -> qid );
1252- nvme_dev_disable (dev , true);
12531252 nvme_req (req )-> flags |= NVME_REQ_CANCELLED ;
1253+ nvme_dev_disable (dev , true);
12541254 return BLK_EH_DONE ;
12551255 case NVME_CTRL_RESETTING :
12561256 return BLK_EH_RESET_TIMER ;
@@ -1267,10 +1267,10 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
12671267 dev_warn (dev -> ctrl .device ,
12681268 "I/O %d QID %d timeout, reset controller\n" ,
12691269 req -> tag , nvmeq -> qid );
1270+ nvme_req (req )-> flags |= NVME_REQ_CANCELLED ;
12701271 nvme_dev_disable (dev , false);
12711272 nvme_reset_ctrl (& dev -> ctrl );
12721273
1273- nvme_req (req )-> flags |= NVME_REQ_CANCELLED ;
12741274 return BLK_EH_DONE ;
12751275 }
12761276
You can’t perform that action at this time.
0 commit comments