openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
James Smart 2017-10-23 15:11:36 -07:00 committed by Christoph Hellwig
parent 56d5f4f108
commit ecad0d2cb8
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/nvme/host/fc.c
View File

@ -2435,7 +2435,6 @@ static int
nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
{ {
struct nvmf_ctrl_options *opts = ctrl->ctrl.opts; struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;
u32 segs;
int ret; int ret;
bool changed; bool changed;
@ -2486,9 +2485,8 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
if (ret) if (ret)
goto out_disconnect_admin_queue; goto out_disconnect_admin_queue;
segs = min_t(u32, NVME_FC_MAX_SEGMENTS, ctrl->ctrl.max_hw_sectors =
ctrl->lport->ops->max_sgl_segments); (ctrl->lport->ops->max_sgl_segments - 1) << (PAGE_SHIFT - 9);
ctrl->ctrl.max_hw_sectors = (segs - 1) << (PAGE_SHIFT - 9);
ret = nvme_init_identify(&ctrl->ctrl); ret = nvme_init_identify(&ctrl->ctrl);
if (ret) if (ret)

2
include/linux/nvme-fc-driver.h
View File

@ -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 * struct nvmefc_fcp_req - Request structure passed from NVME-FC transport
* to LLDD in order to perform a NVME FCP IO operation. * to LLDD in order to perform a NVME FCP IO operation.