diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-10-22 12:03:34 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-22 16:38:32 (GMT) |
| commit | 4c9f748f0ee88447b28546991f60f43a7319aafd (patch) | |
| tree | df22e7ac58f8163258d8a74aaeb243d8440faabb /drivers/nvme | |
| parent | 77bf25ea70200cddf083f74b7f617e5f07fac8bd (diff) | |
| download | linux-4c9f748f0ee88447b28546991f60f43a7319aafd.tar.xz | |
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 <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index ad6d5cc..d4fef81 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. |