svn commit: r299400 - in stable/10/sys/cam: . ctl

[Pedro F. Giffuni]

Author: pfg
Date: Wed May 11 00:59:06 2016
New Revision: 299400
URL: https://svnweb.freebsd.org/changeset/base/299400

Log:
  MFC r298703:
  cam: unsign some types to match their definitions and avoid overflows.
  
  numpatterns is u_int.
  
  ctl:
  CTL_NUM_MODE_PAGES comes from sizeof().
  In struct:ctl_scsiio, kern_sg_entries is uint32_t.

Modified:
  stable/10/sys/cam/cam_xpt.c
  stable/10/sys/cam/ctl/ctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/cam_xpt.c
==============================================================================
--- stable/10/sys/cam/cam_xpt.c	Wed May 11 00:41:40 2016	(r299399)
+++ stable/10/sys/cam/cam_xpt.c	Wed May 11 00:59:06 2016	(r299400)
@@ -1186,7 +1186,7 @@ xptbusmatch(struct dev_match_pattern *pa
 	    struct cam_eb *bus)
 {
 	dev_match_ret retval;
-	int i;
+	u_int i;
 
 	retval = DM_RET_NONE;
 
@@ -1298,7 +1298,7 @@ xptdevicematch(struct dev_match_pattern 
 	       struct cam_ed *device)
 {
 	dev_match_ret retval;
-	int i;
+	u_int i;
 
 	retval = DM_RET_NONE;
 
@@ -1421,7 +1421,7 @@ xptperiphmatch(struct dev_match_pattern 
 	       struct cam_periph *periph)
 {
 	dev_match_ret retval;
-	int i;
+	u_int i;
 
 	/*
 	 * If we aren't given something to match against, that's an error.

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Wed May 11 00:41:40 2016	(r299399)
+++ stable/10/sys/cam/ctl/ctl.c	Wed May 11 00:59:06 2016	(r299400)
@@ -918,7 +918,7 @@ ctl_isc_announce_mode(struct ctl_lun *lu
 {
 	struct ctl_softc *softc = lun->ctl_softc;
 	union ctl_ha_msg msg;
-	int i;
+	u_int i;
 
 	if (softc->ha_link != CTL_HA_LINK_ONLINE)
 		return;
@@ -1286,7 +1286,7 @@ static void
 ctl_isc_mode_sync(struct ctl_softc *softc, union ctl_ha_msg *msg, int len)
 {
 	struct ctl_lun *lun;
-	int i;
+	u_int i;
 	uint32_t initidx, targ_lun;
 
 	targ_lun = msg->hdr.nexus.targ_mapped_lun;
@@ -6407,7 +6407,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
 	 */
 	switch (page_code) {
 	case SMS_ALL_PAGES_PAGE: {
-		int i;
+		u_int i;
 
 		page_len = 0;
 
@@ -6459,7 +6459,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
 		break;
 	}
 	default: {
-		int i;
+		u_int i;
 
 		page_len = 0;
 
@@ -12777,7 +12777,7 @@ static void
 ctl_datamove_remote_write_cb(struct ctl_ha_dt_req *rq)
 {
 	union ctl_io *io;
-	int i;
+	uint32_t i;
 
 	io = rq->context;
 
@@ -12855,7 +12855,7 @@ ctl_datamove_remote_dm_read_cb(union ctl
 	char path_str[64];
 	struct sbuf sb;
 #endif
-	int i;
+	uint32_t i;
 
 	for (i = 0; i < io->scsiio.kern_sg_entries; i++)
 		free(io->io_hdr.local_sglist[i].addr, M_CTL);
@@ -13096,7 +13096,7 @@ static void
 ctl_datamove_remote_read(union ctl_io *io)
 {
 	int retval;
-	int i;
+	uint32_t i;
 
 	/*
 	 * This will send an error to the other controller in the case of a