Commit 7bf7d778 authored Jan 24, 2017 by Keith Busch Committed by Jens Axboe Jan 31, 2017

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 <axboe@kernel.dk>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 9a69b0ed

drivers/nvme/host/pci.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -898,12 +898,11 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
		return BLK_EH_HANDLED;
		}

		iod->aborted = 1;

		if (atomic_dec_return(&dev->ctrl.abort_limit) < 0) {
		atomic_inc(&dev->ctrl.abort_limit);
		return BLK_EH_RESET_TIMER;
		}
		iod->aborted = 1;

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