File tree 1 file changed +2
-2
lines changed 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)
1249
1249
dev_warn_ratelimited (dev -> ctrl .device ,
1250
1250
"I/O %d QID %d timeout, disable controller\n" ,
1251
1251
req -> tag , nvmeq -> qid );
1252
- nvme_dev_disable (dev , true);
1253
1252
nvme_req (req )-> flags |= NVME_REQ_CANCELLED ;
1253
+ nvme_dev_disable (dev , true);
1254
1254
return BLK_EH_DONE ;
1255
1255
case NVME_CTRL_RESETTING :
1256
1256
return BLK_EH_RESET_TIMER ;
@@ -1267,10 +1267,10 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
1267
1267
dev_warn (dev -> ctrl .device ,
1268
1268
"I/O %d QID %d timeout, reset controller\n" ,
1269
1269
req -> tag , nvmeq -> qid );
1270
+ nvme_req (req )-> flags |= NVME_REQ_CANCELLED ;
1270
1271
nvme_dev_disable (dev , false);
1271
1272
nvme_reset_ctrl (& dev -> ctrl );
1272
1273
1273
- nvme_req (req )-> flags |= NVME_REQ_CANCELLED ;
1274
1274
return BLK_EH_DONE ;
1275
1275
}
1276
1276
You can’t perform that action at this time.
0 commit comments