MFC r286406, r286414:

Wrap some unused functions with notyet, it is necessary to be able to
build the modules/ctl directly.
Remove a dead MALLOC_DEFINE.

2 files changed, 14 insertions, 1 deletions

diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index e07e2d0..c5463355 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -376,9 +376,11 @@ SYSCTL_INT(_kern_cam_ctl, OID_AUTO, debug, CTLFLAG_RWTUN,
  */
 #define SCSI_EVPD_NUM_SUPPORTED_PAGES	10
 
+#ifdef notyet
 static void ctl_isc_event_handler(ctl_ha_channel chanel, ctl_ha_event event,
 				  int param);
 static void ctl_copy_sense_data(union ctl_ha_msg *src, union ctl_io *dest);
+#endif
 static int ctl_init(void);
 void ctl_shutdown(void);
 static int ctl_open(struct cdev *dev, int flags, int fmt, struct thread *td);
@@ -446,7 +448,9 @@ static int ctl_scsiio_lun_check(struct ctl_lun *lun,
 				const struct ctl_cmd_entry *entry,
 				struct ctl_scsiio *ctsio);
 //static int ctl_check_rtr(union ctl_io *pending_io, struct ctl_softc *softc);
+#ifdef notyet
 static void ctl_failover(void);
+#endif
 static void ctl_clear_ua(struct ctl_softc *ctl_softc, uint32_t initidx,
 			 ctl_ua_type ua_type);
 static int ctl_scsiio_precheck(struct ctl_softc *ctl_softc,
@@ -485,7 +489,9 @@ static void ctl_work_thread(void *arg);
 static void ctl_enqueue_incoming(union ctl_io *io);
 static void ctl_enqueue_rtr(union ctl_io *io);
 static void ctl_enqueue_done(union ctl_io *io);
+#ifdef notyet
 static void ctl_enqueue_isc(union ctl_io *io);
+#endif
 static const struct ctl_cmd_entry *
     ctl_get_cmd_entry(struct ctl_scsiio *ctsio, int *sa);
 static const struct ctl_cmd_entry *
@@ -513,7 +519,6 @@ static struct cdevsw ctl_cdevsw = {
 
 
 MALLOC_DEFINE(M_CTL, "ctlmem", "Memory used for CTL");
-MALLOC_DEFINE(M_CTLIO, "ctlio", "Memory used for CTL requests");
 
 static int ctl_module_event_handler(module_t, int /*modeventtype_t*/, void *);
 
@@ -531,6 +536,7 @@ static struct ctl_frontend ioctl_frontend =
 	.name = "ioctl",
 };
 
+#ifdef notyet
 static void
 ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc,
 			    union ctl_ha_msg *msg_info)
@@ -965,6 +971,7 @@ ctl_copy_sense_data(union ctl_ha_msg *src, union ctl_io *dest)
 	dest->scsiio.sense_len = src->scsi.sense_len;
 	dest->io_hdr.status = src->hdr.status;
 }
+#endif
 
 static void
 ctl_est_ua(struct ctl_lun *lun, uint32_t initidx, ctl_ua_type ua)
@@ -11367,6 +11374,7 @@ ctl_failover_io(union ctl_io *io, int have_lock)
 	ctl_done(io);
 }
 
+#ifdef notyet
 static void
 ctl_failover(void)
 {
@@ -11607,6 +11615,7 @@ ctl_failover(void)
 	ctl_pause_rtr = 0;
 	mtx_unlock(&softc->ctl_lock);
 }
+#endif
 
 static void
 ctl_clear_ua(struct ctl_softc *ctl_softc, uint32_t initidx,
@@ -14233,6 +14242,7 @@ ctl_enqueue_done(union ctl_io *io)
 	wakeup(thr);
 }
 
+#ifdef notyet
 static void
 ctl_enqueue_isc(union ctl_io *io)
 {
@@ -14345,6 +14355,7 @@ struct ctl_ha_component ctl_ha_component_ctlisc =
 	.start = ctl_isc_start,
 	.quiesce = ctl_isc_quiesce
 };
+#endif
 
 /*
  *  vim: ts=8
diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h
index 2693419..b1d9118 100644
--- a/sys/cam/ctl/ctl.h
+++ b/sys/cam/ctl/ctl.h
@@ -191,7 +191,9 @@ void ctl_data_submit_done(union ctl_io *io);
 void ctl_config_read_done(union ctl_io *io);
 void ctl_config_write_done(union ctl_io *io);
 void ctl_portDB_changed(int portnum);
+#ifdef notyet
 void ctl_init_isc_msg(void);
+#endif
 
 /*
  * KPI to manipulate LUN/port options