From 4c9f748f0ee88447b28546991f60f43a7319aafd Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 22 Oct 2015 14:03:34 +0200 Subject: [PATCH] nvme: don't take the I/O queue q_lock in nvme_timeout There is nothing it protects, but it makes lockdep unhappy in many different ways. Signed-off-by: Christoph Hellwig Signed-off-by: Keith Busch Signed-off-by: Jens Axboe --- drivers/nvme/host/pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index ad6d5cce42d5..d4fef8190093 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1094,13 +1094,13 @@ static void nvme_abort_req(struct request *req) struct nvme_command cmd; if (!nvmeq->qid || cmd_rq->aborted) { - spin_lock(&dev_list_lock); + spin_lock_irq(&dev_list_lock); if (!__nvme_reset(dev)) { dev_warn(dev->dev, "I/O %d QID %d timeout, reset controller\n", req->tag, nvmeq->qid); } - spin_unlock(&dev_list_lock); + spin_unlock_irq(&dev_list_lock); return; } @@ -1164,9 +1164,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) dev_warn(nvmeq->q_dmadev, "Timeout I/O %d QID %d\n", req->tag, nvmeq->qid); - spin_lock_irq(&nvmeq->q_lock); nvme_abort_req(req); - spin_unlock_irq(&nvmeq->q_lock); /* * The aborted req will be completed on receiving the abort req.