Author: trasz
Date: Sun Jan 22 20:06:15 2017
New Revision: 312651
URL: https://svnweb.freebsd.org/changeset/base/312651
Log:
Remove max_targets and max_target_id CTL port variables; they were unused.
This changes the CTL frontend ABI and thus shouldn't be MFC-ed.
Reviewed by: mav@
Modified:
head/sys/cam/ctl/ctl_frontend.h
head/sys/cam/ctl/ctl_frontend_cam_sim.c
head/sys/cam/ctl/ctl_frontend_ioctl.c
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/cam/ctl/ctl_tpc_local.c
head/sys/cam/ctl/scsi_ctl.c
Modified: head/sys/cam/ctl/ctl_frontend.h
==============================================================================
--- head/sys/cam/ctl/ctl_frontend.h Sun Jan 22 20:03:18 2017
(r312650)
+++ head/sys/cam/ctl/ctl_frontend.h Sun Jan 22 20:06:15 2017
(r312651)
@@ -120,7 +120,6 @@ struct ctl_wwpn_iid {
* port_name: A string describing the FETD. e.g. "LSI 1030T U320"
* or whatever you want to use to describe the driver.
*
- *
* physical_port: This is the physical port number of this
* particular port within the driver/hardware. This
* number is hardware/driver specific.
@@ -179,11 +178,6 @@ struct ctl_wwpn_iid {
* to request a dump of any debugging information or
* state to the console.
*
- * max_targets: The maximum number of targets that we can
create
- * per-port.
- *
- * max_target_id: The highest target ID that we can use.
- *
* targ_port: The CTL layer assigns a "port number" to every
* FETD. This port number should be passed back in
* in the header of every ctl_io that is queued to
@@ -234,8 +228,6 @@ struct ctl_port {
void *targ_lun_arg; /* passed to CTL */
void (*fe_datamove)(union ctl_io *io); /* passed to CTL */
void (*fe_done)(union ctl_io *io); /* passed to CTL */
- int max_targets; /* passed to CTL */
- int max_target_id; /* passed to CTL */
int32_t targ_port; /* passed back to FETD */
void *ctl_pool_ref; /* passed back to FETD */
uint32_t max_initiators; /* passed back to FETD */
Modified: head/sys/cam/ctl/ctl_frontend_cam_sim.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_cam_sim.c Sun Jan 22 20:03:18 2017
(r312650)
+++ head/sys/cam/ctl/ctl_frontend_cam_sim.c Sun Jan 22 20:06:15 2017
(r312651)
@@ -147,11 +147,6 @@ cfcs_init(void)
port->onoff_arg = softc;
port->fe_datamove = cfcs_datamove;
port->fe_done = cfcs_done;
-
- /* XXX KDM what should we report here? */
- /* XXX These should probably be fetched from CTL. */
- port->max_targets = 1;
- port->max_target_id = 15;
port->targ_port = -1;
retval = ctl_port_register(port);
Modified: head/sys/cam/ctl/ctl_frontend_ioctl.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_ioctl.c Sun Jan 22 20:03:18 2017
(r312650)
+++ head/sys/cam/ctl/ctl_frontend_ioctl.c Sun Jan 22 20:06:15 2017
(r312651)
@@ -104,8 +104,6 @@ cfi_init(void)
port->port_name = "ioctl";
port->fe_datamove = cfi_datamove;
port->fe_done = cfi_done;
- port->max_targets = 1;
- port->max_target_id = 0;
port->targ_port = -1;
port->max_initiators = 1;
Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Jan 22 20:03:18 2017
(r312650)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Jan 22 20:06:15 2017
(r312651)
@@ -2127,11 +2127,6 @@ cfiscsi_ioctl_port_create(struct ctl_req
port->onoff_arg = ct;
port->fe_datamove = cfiscsi_datamove;
port->fe_done = cfiscsi_done;
-
- /* XXX KDM what should we report here? */
- /* XXX These should probably be fetched from CTL. */
- port->max_targets = 1;
- port->max_target_id = 15;
port->targ_port = -1;
port->options = opts;
Modified: head/sys/cam/ctl/ctl_tpc_local.c
==============================================================================
--- head/sys/cam/ctl/ctl_tpc_local.c Sun Jan 22 20:03:18 2017
(r312650)
+++ head/sys/cam/ctl/ctl_tpc_local.c Sun Jan 22 20:06:15 2017
(r312651)
@@ -95,8 +95,6 @@ tpcl_init(void)
port->port_name = "tpc";
port->fe_datamove = tpcl_datamove;
port->fe_done = tpcl_done;
- port->max_targets = 1;
- port->max_target_id = 0;
port->targ_port = -1;
port->max_initiators = 1;
Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c Sun Jan 22 20:03:18 2017 (r312650)
+++ head/sys/cam/ctl/scsi_ctl.c Sun Jan 22 20:06:15 2017 (r312651)
@@ -402,12 +402,6 @@ ctlfeasync(void *callback_arg, uint32_t
port->targ_lun_arg = softc;
port->fe_datamove = ctlfe_datamove;
port->fe_done = ctlfe_done;
- /*
- * XXX KDM the path inquiry doesn't give us the maximum
- * number of targets supported.
- */
- port->max_targets = cpi->max_target;
- port->max_target_id = cpi->max_target;
port->targ_port = -1;
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
