Skip to content

Commit 7bf7d77

Browse files
Keith Buschaxboe
authored andcommitted
nvme/pci: Don't mark IOD as aborted if abort wasn't sent
This patch sets the aborted flag only if an abort was sent, reducing excessive kernel message spamming for completed IO that wasn't actually aborted. Reported-by: Jens Axboe <[email protected]> Signed-off-by: Keith Busch <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Sagi Grimberg <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 9a69b0e commit 7bf7d77

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/nvme/host/pci.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -898,12 +898,11 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
898898
return BLK_EH_HANDLED;
899899
}
900900

901-
iod->aborted = 1;
902-
903901
if (atomic_dec_return(&dev->ctrl.abort_limit) < 0) {
904902
atomic_inc(&dev->ctrl.abort_limit);
905903
return BLK_EH_RESET_TIMER;
906904
}
905+
iod->aborted = 1;
907906

908907
memset(&cmd, 0, sizeof(cmd));
909908
cmd.abort.opcode = nvme_admin_abort_cmd;

0 commit comments

Comments
 (0)