nvme-pci: drop IRQ disabling on submission queue lock
authorJens Axboe <axboe@kernel.dk>
Thu, 17 May 2018 16:31:52 +0000 (18:31 +0200)
committerKeith Busch <keith.busch@intel.com>
Fri, 18 May 2018 20:41:36 +0000 (14:41 -0600)
Since we aren't sharing the lock for completions now, we don't
have to make it IRQ safe.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/pci.c

index 1b49b694a57a3b207bc018a4fd6fe85ef72ac49c..133fc063d10c747ed60997ed4961a262505a81ba 100644 (file)
@@ -895,9 +895,9 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
 
        blk_mq_start_request(req);
 
-       spin_lock_irq(&nvmeq->sq_lock);
+       spin_lock(&nvmeq->sq_lock);
        __nvme_submit_cmd(nvmeq, &cmnd);
-       spin_unlock_irq(&nvmeq->sq_lock);
+       spin_unlock(&nvmeq->sq_lock);
        return BLK_STS_OK;
 out_cleanup_iod:
        nvme_free_iod(dev, req);
@@ -1052,9 +1052,9 @@ static void nvme_pci_submit_async_event(struct nvme_ctrl *ctrl)
        c.common.opcode = nvme_admin_async_event;
        c.common.command_id = NVME_AQ_BLK_MQ_DEPTH;
 
-       spin_lock_irq(&nvmeq->sq_lock);
+       spin_lock(&nvmeq->sq_lock);
        __nvme_submit_cmd(nvmeq, &c);
-       spin_unlock_irq(&nvmeq->sq_lock);
+       spin_unlock(&nvmeq->sq_lock);
 }
 
 static int adapter_delete_queue(struct nvme_dev *dev, u8 opcode, u16 id)