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. MFC after: 2 weeks
This commit is contained in:
parent
9a5be809ab
commit
167e63e394
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=298703
@ -1182,7 +1182,7 @@ xptbusmatch(struct dev_match_pattern *patterns, u_int num_patterns,
|
||||
struct cam_eb *bus)
|
||||
{
|
||||
dev_match_ret retval;
|
||||
int i;
|
||||
u_int i;
|
||||
|
||||
retval = DM_RET_NONE;
|
||||
|
||||
@ -1294,7 +1294,7 @@ xptdevicematch(struct dev_match_pattern *patterns, u_int num_patterns,
|
||||
struct cam_ed *device)
|
||||
{
|
||||
dev_match_ret retval;
|
||||
int i;
|
||||
u_int i;
|
||||
|
||||
retval = DM_RET_NONE;
|
||||
|
||||
@ -1417,7 +1417,7 @@ xptperiphmatch(struct dev_match_pattern *patterns, u_int num_patterns,
|
||||
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.
|
||||
|
@ -916,7 +916,7 @@ ctl_isc_announce_mode(struct ctl_lun *lun, uint32_t initidx,
|
||||
{
|
||||
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;
|
||||
@ -1284,7 +1284,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;
|
||||
@ -6405,7 +6405,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
|
||||
*/
|
||||
switch (page_code) {
|
||||
case SMS_ALL_PAGES_PAGE: {
|
||||
int i;
|
||||
u_int i;
|
||||
|
||||
page_len = 0;
|
||||
|
||||
@ -6457,7 +6457,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
int i;
|
||||
u_int i;
|
||||
|
||||
page_len = 0;
|
||||
|
||||
@ -12775,7 +12775,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;
|
||||
|
||||
@ -12853,7 +12853,7 @@ ctl_datamove_remote_dm_read_cb(union ctl_io *io)
|
||||
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);
|
||||
@ -13094,7 +13094,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
|
||||
|
Loading…
Reference in New Issue
Block a user