nvme-fabrics: handle the admin-only case properly in nvmf_check_ready

Christoph Hellwig · Christoph Hellwig · commit 278ab3799a25 · 2018-06-15T11:21:00.000+02:00
In the ADMIN_ONLY state we don't have any I/O queues, but we should accept
all admin commands without further checks.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Reviewed-by: Johannes Thumshirn &lt;jthumshirn@suse.de&gt;
Reviewed-by: James Smart &lt;james.smart@broadcom.com&gt;
diff --git a/drivers/nvme/host/fabrics.h b/drivers/nvme/host/fabrics.h
@@ -169,7 +169,8 @@ bool __nvmf_check_ready(struct nvme_ctrl *ctrl, struct request *rq,
 static inline bool nvmf_check_ready(struct nvme_ctrl *ctrl, struct request *rq,
 		bool queue_live)
 {
-	if (likely(ctrl->state == NVME_CTRL_LIVE))
+	if (likely(ctrl->state == NVME_CTRL_LIVE ||
+		   ctrl->state == NVME_CTRL_ADMIN_ONLY))
 		return true;
 	return __nvmf_check_ready(ctrl, rq, queue_live);
 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,8 @@ bool __nvmf_check_ready(struct nvme_ctrl ctrl, struct request rq,`
`169`	`169`	`static inline bool nvmf_check_ready(struct nvme_ctrl ctrl, struct request rq,`
`170`	`170`	`bool queue_live)`
`171`	`171`	`{`
`172`		`- if (likely(ctrl->state == NVME_CTRL_LIVE))`
	`172`	`+ if (likely(ctrl->state == NVME_CTRL_LIVE \|\|`
	`173`	`+ ctrl->state == NVME_CTRL_ADMIN_ONLY))`
`173`	`174`	`return true;`
`174`	`175`	`return __nvmf_check_ready(ctrl, rq, queue_live);`
`175`	`176`	`}`