diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2017-09-21 16:01:36 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-09-25 20:42:11 +0200 |
| commit | 1a40d97288c6ffea9b355139e88fa62f0e5439f7 (patch) | |
| tree | d490c2ad387e61dff0f0289e0542c4b25b44c3bc /drivers | |
| parent | nvme: fix sqhd reference when admin queue connect fails (diff) | |
| download | linux-1a40d97288c6ffea9b355139e88fa62f0e5439f7.tar.xz linux-1a40d97288c6ffea9b355139e88fa62f0e5439f7.zip | |
nvme-core: Use nvme_wq to queue async events and fw activation
async_event_work might race as it is executed from two different
workqueues at the moment.
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5589f67d2cd8..bb2aad078637 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2676,7 +2676,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, case NVME_SC_ABORT_REQ: ++ctrl->event_limit; if (ctrl->state == NVME_CTRL_LIVE) - schedule_work(&ctrl->async_event_work); + queue_work(nvme_wq, &ctrl->async_event_work); break; default: break; @@ -2691,7 +2691,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, nvme_queue_scan(ctrl); break; case NVME_AER_NOTICE_FW_ACT_STARTING: - schedule_work(&ctrl->fw_act_work); + queue_work(nvme_wq, &ctrl->fw_act_work); break; default: dev_warn(ctrl->device, "async event result %08x\n", result); |