summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2016-06-13 16:45:22 +0200
committerJens Axboe <axboe@fb.com>2016-07-05 19:28:09 +0200
commit7d2e80080d186c1267f3033b6de91f0ff2f2863d (patch)
treeb25c6cffba0c187e15b439b810f5d21ede061585
parentblk-mq: add blk_mq_alloc_request_hctx (diff)
downloadlinux-7d2e80080d186c1267f3033b6de91f0ff2f2863d.tar.xz
linux-7d2e80080d186c1267f3033b6de91f0ff2f2863d.zip
nvme: allow transitioning from NEW to LIVE state
For Fabrics we're not going through an intermediate reset state (at least for now). Reviewed-by: Jay Freyensee <james.p.freyensee@intel.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/nvme/host/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 9d7cee463fd6..f874c0e6b4bd 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -85,6 +85,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
switch (new_state) {
case NVME_CTRL_LIVE:
switch (old_state) {
+ case NVME_CTRL_NEW:
case NVME_CTRL_RESETTING:
changed = true;
/* FALLTHRU */