NVMe: Do not cancel command multiple times

PATCH New Keith Busch 1 participant 1 message Apr 30, 2013

Subsystems (2)

Block layer NVMe

lore

Share & tools

lore

Keith Busch

author

2013-04-30 17:19 UTC #0 lore raw

PATCH 1/1 NVMe: Do not cancel command multiple times

Cancelling an already cancelled command does not do anything, so check the command context before cancelling it, continuing if had already been cancelled so we do not log the same problem every second if a device stops responding.

Signed-off-by Keith Busch <keith.busch at intel.com>

---
 drivers/block/nvme-core.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

drivers/block/nvme-core.c +2 -0

index 40908a0..8899e79 100644
@@ -880,6 +880,8 @@ static void nvme_cancel_ios(struct nvme_queue *nvmeq, bool timeout)
 
 		if (timeout && !time_after(now, info[cmdid].timeout))
 			continue;
+		if (info[cmdid].ctx == CMD_CTX_CANCELLED)
+			continue;
 		dev_warn(nvmeq->q_dmadev, "Cancelling I/O %d\n", cmdid);
 		ctx = cancel_cmdid(nvmeq, cmdid, &fn);
 		fn(nvmeq->dev, ctx, &cqe);

Signature · 1 line

1.7.0.4