nvme-fc: remove NVME_FC_MAX_SEGMENTS

The define is an arbitrary limit to the io size on the initiator,
capping the io to 1MB-4KB.

Remove the define from the transport. I/O size will solely be limited
by the LLDD sg limits.

Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index d12775d1298357941ae7fd1dab8a328c022b5628..b600c07803cf37cc66a7610033d0e85f21c03744 100644 (file)
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -2435,7 +2435,6 @@ static int
 nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
 {
        struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;
-       u32 segs;
        int ret;
        bool changed;
 
@@ -2486,9 +2485,8 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
        if (ret)
                goto out_disconnect_admin_queue;
 
-       segs = min_t(u32, NVME_FC_MAX_SEGMENTS,
-                       ctrl->lport->ops->max_sgl_segments);
-       ctrl->ctrl.max_hw_sectors = (segs - 1) << (PAGE_SHIFT - 9);
+       ctrl->ctrl.max_hw_sectors =
+               (ctrl->lport->ops->max_sgl_segments - 1) << (PAGE_SHIFT - 9);
 
        ret = nvme_init_identify(&ctrl->ctrl);
        if (ret)

diff --git a/include/linux/nvme-fc-driver.h b/include/linux/nvme-fc-driver.h
index 4ea03b9a5c8cb9e2090fb73eba02e325bf8b02e8..2be4db3539379b1c56d3c82574e20fc449230f06 100644 (file)
--- a/include/linux/nvme-fc-driver.h
+++ b/include/linux/nvme-fc-driver.h
@@ -102,8 +102,6 @@ enum nvmefc_fcp_datadir {
 };
 
 
-#define NVME_FC_MAX_SEGMENTS           256
-
 /**
  * struct nvmefc_fcp_req - Request structure passed from NVME-FC transport
  *                         to LLDD in order to perform a NVME FCP IO operation.