summaryrefslogtreecommitdiffstats
path: root/drivers/nvme/host/nvme.h
diff options
context:
space:
mode:
authorKeith Busch2016-01-04 17:10:57 +0100
committerJens Axboe2016-01-12 21:33:36 +0100
commit25646264e15af96c5c630fc742708b1eb3339222 (patch)
tree3d0633fe7142d8b99ac988f9121777fe6012478c /drivers/nvme/host/nvme.h
parentNVMe: Use a retryable error code on reset (diff)
downloadkernel-qcow2-linux-25646264e15af96c5c630fc742708b1eb3339222.tar.gz
kernel-qcow2-linux-25646264e15af96c5c630fc742708b1eb3339222.tar.xz
kernel-qcow2-linux-25646264e15af96c5c630fc742708b1eb3339222.zip
NVMe: Remove queue freezing on resets
NVMe submits all commands through the block layer now. This means we can let requests queue at the blk-mq hardware context since there is no path that bypasses this anymore so we don't need to freeze the queues anymore. The driver can simply stop the h/w queues from running during a reset instead. This also fixes a WARN in percpu_ref_reinit when the queue was unfrozen with requeued requests. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/nvme.h')
-rw-r--r--drivers/nvme/host/nvme.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 44375923bd6a..4722fadde0f1 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -238,8 +238,8 @@ int nvme_init_identify(struct nvme_ctrl *ctrl);
void nvme_scan_namespaces(struct nvme_ctrl *ctrl);
void nvme_remove_namespaces(struct nvme_ctrl *ctrl);
-void nvme_freeze_queues(struct nvme_ctrl *ctrl);
-void nvme_unfreeze_queues(struct nvme_ctrl *ctrl);
+void nvme_stop_queues(struct nvme_ctrl *ctrl);
+void nvme_start_queues(struct nvme_ctrl *ctrl);
struct request *nvme_alloc_request(struct request_queue *q,
struct nvme_command *cmd, unsigned int flags);