diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2018-05-17 18:31:52 +0200 |
|---|---|---|
| committer |   Keith Busch <keith.busch@intel.com> | 2018-05-18 14:41:36 -0600 |
| commit | 1eae349d18fc7b8e7d88673f7194d7a542fdb25c (patch) | |
| tree | da61b73d693c5aff76f37e5c31ef52e3394ccfd2 /drivers/nvme/host/pci.c | |
| parent | nvme-pci: split the nvme queue lock into submission and completion locks (diff) | |
| download | linux-dev-1eae349d18fc7b8e7d88673f7194d7a542fdb25c.tar.xz linux-dev-1eae349d18fc7b8e7d88673f7194d7a542fdb25c.zip | |
nvme-pci: drop IRQ disabling on submission queue lock
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/nvme/host/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 1b49b694a57a..133fc063d10c 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -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) |