iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: don't take the I/O queue q_lock in nvme_timeout

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2015-10-22 14:03:34 +02:00 committed by Jens Axboe
parent 77bf25ea70
commit 4c9f748f0e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/nvme/host/pci.c
View File

@ -1094,13 +1094,13 @@ static void nvme_abort_req(struct request *req)
struct nvme_command cmd; struct nvme_command cmd;
if (!nvmeq->qid || cmd_rq->aborted) { if (!nvmeq->qid || cmd_rq->aborted) {
spin_lock(&dev_list_lock); spin_lock_irq(&dev_list_lock);
if (!__nvme_reset(dev)) { if (!__nvme_reset(dev)) {
dev_warn(dev->dev, dev_warn(dev->dev,
"I/O %d QID %d timeout, reset controller\n", "I/O %d QID %d timeout, reset controller\n",
req->tag, nvmeq->qid); req->tag, nvmeq->qid);
} }
spin_unlock(&dev_list_lock); spin_unlock_irq(&dev_list_lock);
return; 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, dev_warn(nvmeq->q_dmadev, "Timeout I/O %d QID %d\n", req->tag,
nvmeq->qid); nvmeq->qid);
spin_lock_irq(&nvmeq->q_lock);
nvme_abort_req(req); nvme_abort_req(req);
spin_unlock_irq(&nvmeq->q_lock);
/* /*
* The aborted req will be completed on receiving the abort req. * The aborted req will be completed on receiving the abort req.