Skip to content

Commit

Permalink
nvme-pci: drop IRQ disabling on submission queue lock
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jens Axboe authored and Keith Busch committed May 18, 2018
1 parent 1ab0cd6 commit 1eae349
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/nvme/host/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 1eae349

Please sign in to comment.