diff options
| author | Keith Busch <keith.busch@intel.com> | 2018-06-06 08:13:04 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-06-08 12:51:10 -0600 |
| commit | 0bc88192033a6e652e3fb1adfd6d1b66be33951e (patch) | |
| tree | 37aa996bd0275c284f5df87741fc2f9f68726287 | |
| parent | 9ba2a5cb88969c847015905db7f1627ae3c82f73 (diff) | |
| download | linux-0bc88192033a6e652e3fb1adfd6d1b66be33951e.tar.bz2 | |
nvme-pci: remove unnecessary nested locking
The nvme pci driver no longer handles completions under the cq lock,
so the nested locking is not necessary.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/nvme/host/pci.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index e526437bacbf..a7bed8dccd61 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2012,13 +2012,7 @@ static void nvme_del_cq_end(struct request *req, blk_status_t error) if (!error) { unsigned long flags; - /* - * We might be called with the AQ cq_lock held - * and the I/O queue cq_lock should always - * nest inside the AQ one. - */ - spin_lock_irqsave_nested(&nvmeq->cq_lock, flags, - SINGLE_DEPTH_NESTING); + spin_lock_irqsave(&nvmeq->cq_lock, flags); nvme_process_cq(nvmeq, &start, &end, -1); spin_unlock_irqrestore(&nvmeq->cq_lock, flags); |