Mercurial > illumos > illumos-gate
changeset 10906:f2bf04f06f29
backout 6739984: does not build
author | jmcp <James.McPherson@Sun.COM> |
---|---|
date | Thu, 29 Oct 2009 08:02:51 -0700 |
parents | 3295b315d7d3 |
children | 881ceecbca49 |
files | usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c usr/src/uts/common/io/scsi/adapters/scsi_vhci/mpapi_impl.c usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c |
diffstat | 3 files changed, 3 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c Thu Oct 29 22:27:15 2009 +0800 +++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c Thu Oct 29 08:02:51 2009 -0700 @@ -248,7 +248,7 @@ return (0); } - if (mode == SCSI_EXPLICIT_FAILOVER) { + if (mode != SCSI_IMPLICIT_FAILOVER) { VHCI_DEBUG(4, (CE_NOTE, NULL, "!mode is EXPLICIT for %p xlf %x\n", (void *)sd, xlf));
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/mpapi_impl.c Thu Oct 29 22:27:15 2009 +0800 +++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/mpapi_impl.c Thu Oct 29 08:02:51 2009 -0700 @@ -1655,12 +1655,7 @@ } else { vhci_update_pathstates((void *)svl); } - if (desired_state != mptpgd->prop.accessState - (desired_state != MP_DRVR_ACCESS_STATE_ACTIVE || - (mptpgd->prop.accessState != - MP_DRVR_ACCESS_STATE_ACTIVE_OPTIMIZED && - mptpgd->prop.accessState != - MP_DRVR_ACCESS_STATE_ACTIVE_NONOPTIMIZED))) { + if (desired_state != mptpgd->prop.accessState) { VHCI_DEBUG(1, (CE_WARN, NULL, "vhci_set_tpg_" "access_state: TPGAccessState NOT Set: " "des_state=%x, cur_state=%x", desired_state,
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c Thu Oct 29 22:27:15 2009 +0800 +++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c Thu Oct 29 08:02:51 2009 -0700 @@ -75,7 +75,7 @@ } bp->b_un.b_addr = bufp; - bp->b_flags = B_WRITE; + bp->b_flags = B_READ; bp->b_bcount = len; bp->b_resid = 0; @@ -172,12 +172,6 @@ scsi_destroy_pkt(pkt); return (0); } - } else if ((pkt->pkt_reason == CMD_CMPLT) && - (SCBP_C(pkt) == STATUS_GOOD)) { - freerbuf(bp); - kmem_free((void *)bufp, len); - scsi_destroy_pkt(pkt); - return (0); } freerbuf(bp);