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 <[email protected]>
Reviewed-by: Jens Axboe <[email protected]>
Reviewed-by: Sagi Grimberg <[email protected]>
Reviewed-by: Johannes Thumshirn <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e526437bacbf7fc5f5618ba954ae54f84b799c2f..a7bed8dccd61b97592eee64df41a35ad349c3a30 100644 (file)
--- 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);