Author: mav
Date: Thu Dec 18 08:27:00 2014
New Revision: 275883
URL: https://svnweb.freebsd.org/changeset/base/275883
Log:
MFC r275403: Removed unused variable and unify some names.
Modified:
stable/10/sys/cam/ctl/ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c Thu Dec 18 08:26:11 2014 (r275882)
+++ stable/10/sys/cam/ctl/ctl.c Thu Dec 18 08:27:00 2014 (r275883)
@@ -10970,7 +10970,6 @@ ctl_check_blocked(struct ctl_lun *lun)
case CTL_ACTION_SKIP: {
struct ctl_softc *softc;
const struct ctl_cmd_entry *entry;
- uint32_t initidx;
int isc_retval;
/*
@@ -11010,8 +11009,6 @@ ctl_check_blocked(struct ctl_lun *lun)
entry = ctl_get_cmd_entry(&cur_blocked->scsiio, NULL);
softc = control_softc;
- initidx = ctl_get_initindex(&cur_blocked->io_hdr.nexus);
-
/*
* Check this I/O for LUN state changes that may
* have happened while this command was blocked.
@@ -11848,7 +11845,7 @@ ctl_lun_reset(struct ctl_lun *lun, union
{
union ctl_io *xio;
#if 0
- uint32_t initindex;
+ uint32_t initidx;
#endif
int i;
@@ -11868,9 +11865,9 @@ ctl_lun_reset(struct ctl_lun *lun, union
* This version sets unit attention for every
*/
#if 0
- initindex = ctl_get_initindex(&io->io_hdr.nexus);
+ initidx = ctl_get_initindex(&io->io_hdr.nexus);
for (i = 0; i < CTL_MAX_INITIATORS; i++) {
- if (initindex == i)
+ if (initidx == i)
continue;
lun->pending_ua[i] |= ua_type;
}
@@ -11978,9 +11975,9 @@ ctl_i_t_nexus_reset(union ctl_io *io)
{
struct ctl_softc *softc = control_softc;
struct ctl_lun *lun;
- uint32_t initindex, residx;
+ uint32_t initidx, residx;
- initindex = ctl_get_initindex(&io->io_hdr.nexus);
+ initidx = ctl_get_initindex(&io->io_hdr.nexus);
residx = ctl_get_resindex(&io->io_hdr.nexus);
mtx_lock(&softc->ctl_lock);
STAILQ_FOREACH(lun, &softc->lun_list, links) {
@@ -11989,11 +11986,11 @@ ctl_i_t_nexus_reset(union ctl_io *io)
io->io_hdr.nexus.initid.id,
(io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC) != 0);
#ifdef CTL_WITH_CA
- ctl_clear_mask(lun->have_ca, initindex);
+ ctl_clear_mask(lun->have_ca, initidx);
#endif
if ((lun->flags & CTL_LUN_RESERVED) && (lun->res_idx == residx))
lun->flags &= ~CTL_LUN_RESERVED;
- lun->pending_ua[initindex] |= CTL_UA_I_T_NEXUS_LOSS;
+ lun->pending_ua[initidx] |= CTL_UA_I_T_NEXUS_LOSS;
mtx_unlock(&lun->lun_lock);
}
mtx_unlock(&softc->ctl_lock);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
