Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc88192 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

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: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9ba2a5cb

drivers/nvme/host/pci.c

+1 −7
Original line number Diff line number Diff line
@@ -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);