aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Smart <jsmart2021@gmail.com>2017-02-17 10:57:28 -0500
committerJens Axboe <axboe@fb.com>2017-02-22 15:34:00 -0500
commitfaef3af69dd7976315d37316698a436b81d05363 (patch)
tree3b99804390a6b3f87701dae14626b26e34b37ab2
parent9ef3932e250f8e2e11ffbc0c1f28b3ba5dc40cd6 (diff)
nvme-fc: don't bother to validate ioccsz and iorcsz
Discovery controllers don't set the values. They are in reserved areas of the Identify Controller data structure. Given the cmd completed, the minimal capsule sizes are supported, so no need to check nqn to detect discovery controllers and special case validations. Signed-off-by: James Smart <james.smart@broadcom.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/nvme/host/fc.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 6186fde718f9..9690beb15e69 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -2353,18 +2353,6 @@ __nvme_fc_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
2353 2353
2354 /* sanity checks */ 2354 /* sanity checks */
2355 2355
2356 /* FC-NVME supports 64-byte SQE only */
2357 if (ctrl->ctrl.ioccsz != 4) {
2358 dev_err(ctrl->ctrl.device, "ioccsz %d is not supported!\n",
2359 ctrl->ctrl.ioccsz);
2360 goto out_remove_admin_queue;
2361 }
2362 /* FC-NVME supports 16-byte CQE only */
2363 if (ctrl->ctrl.iorcsz != 1) {
2364 dev_err(ctrl->ctrl.device, "iorcsz %d is not supported!\n",
2365 ctrl->ctrl.iorcsz);
2366 goto out_remove_admin_queue;
2367 }
2368 /* FC-NVME does not have other data in the capsule */ 2356 /* FC-NVME does not have other data in the capsule */
2369 if (ctrl->ctrl.icdoff) { 2357 if (ctrl->ctrl.icdoff) {
2370 dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n", 2358 dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",