Date: Mon, 1 Apr 2013 19:11:44 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r248982 - in projects/camlock/sys: cam cam/ata cam/ctl cam/scsi dev/aac dev/arcmsr dev/ata dev/ciss dev/firewire dev/hpt27xx dev/hptiop dev/hptrr dev/isci dev/iscsi/initiator dev/isp de... Message-ID: <201304011911.r31JBiSE078444@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Apr 1 19:11:43 2013 New Revision: 248982 URL: http://svnweb.freebsd.org/changeset/base/248982 Log: Stop abusing xpt_periph in random plases that really have no periph related to CCB, for example, bus scanning. NULL value is fine in such cases and it is correctly logged in debug messages as "noperiph". If at some point we need some real XPT periphs (alike to pmpX now), quite likely they will be per-bus, and not a single global instance as xpt_periph now. Modified: projects/camlock/sys/cam/ata/ata_xpt.c projects/camlock/sys/cam/cam_xpt.c projects/camlock/sys/cam/ctl/ctl_frontend_cam_sim.c projects/camlock/sys/cam/scsi/scsi_xpt.c projects/camlock/sys/dev/aac/aac_cam.c projects/camlock/sys/dev/arcmsr/arcmsr.c projects/camlock/sys/dev/ata/atapi-cam.c projects/camlock/sys/dev/ciss/ciss.c projects/camlock/sys/dev/firewire/sbp.c projects/camlock/sys/dev/hpt27xx/osm_bsd.c projects/camlock/sys/dev/hptiop/hptiop.c projects/camlock/sys/dev/hptrr/hptrr_osm_bsd.c projects/camlock/sys/dev/isci/isci_controller.c projects/camlock/sys/dev/isci/isci_domain.c projects/camlock/sys/dev/isci/isci_remote_device.c projects/camlock/sys/dev/iscsi/initiator/isc_cam.c projects/camlock/sys/dev/isp/isp_freebsd.c projects/camlock/sys/dev/mfi/mfi_cam.c projects/camlock/sys/dev/mly/mly.c projects/camlock/sys/dev/mps/mps_sas.c projects/camlock/sys/dev/mpt/mpt_cam.c projects/camlock/sys/dev/mpt/mpt_raid.c projects/camlock/sys/dev/twa/tw_osl_cam.c projects/camlock/sys/dev/tws/tws_cam.c projects/camlock/sys/dev/virtio/scsi/virtio_scsi.c Modified: projects/camlock/sys/cam/ata/ata_xpt.c ============================================================================== --- projects/camlock/sys/cam/ata/ata_xpt.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/cam/ata/ata_xpt.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1413,7 +1413,7 @@ done: scan_info->counter = (scan_info->counter + 1 ) % (scan_info->cpi->max_target + 1); scan_next: - status = xpt_create_path(&path, xpt_periph, + status = xpt_create_path(&path, NULL, scan_info->request_ccb->ccb_h.path_id, scan_info->counter, 0); if (status != CAM_REQ_CMP) { @@ -1471,7 +1471,7 @@ ata_scan_lun(struct cam_periph *periph, "can't continue\n"); return; } - status = xpt_create_path(&new_path, xpt_periph, + status = xpt_create_path(&new_path, NULL, path->bus->path_id, path->target->target_id, path->device->lun_id); Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/cam/cam_xpt.c Mon Apr 1 19:11:43 2013 (r248982) @@ -458,7 +458,7 @@ xptioctl(struct cdev *dev, u_long cmd, c * Create a path using the bus, target, and lun the * user passed in. */ - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, inccb->ccb_h.path_id, inccb->ccb_h.target_id, inccb->ccb_h.target_lun) != @@ -494,7 +494,7 @@ xptioctl(struct cdev *dev, u_long cmd, c * Create a path using the bus, target, and lun the * user passed in. */ - if (xpt_create_path(&ccb.ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb.ccb_h.path, NULL, inccb->ccb_h.path_id, inccb->ccb_h.target_id, inccb->ccb_h.target_lun) != @@ -2956,7 +2956,7 @@ xpt_action_default(union ccb *start_ccb) CAM_SIM_LOCK(xpt_path_sim(start_ccb->ccb_h.path)); } if (start_ccb->cdbg.flags != CAM_DEBUG_NONE) { - if (xpt_create_path(&cam_dpath, xpt_periph, + if (xpt_create_path(&cam_dpath, NULL, start_ccb->ccb_h.path_id, start_ccb->ccb_h.target_id, start_ccb->ccb_h.target_lun) != @@ -4669,7 +4669,7 @@ xpt_config(void *arg) /* Setup debugging path */ if (cam_dflags != CAM_DEBUG_NONE) { - if (xpt_create_path_unlocked(&cam_dpath, xpt_periph, + if (xpt_create_path_unlocked(&cam_dpath, NULL, CAM_DEBUG_BUS, CAM_DEBUG_TARGET, CAM_DEBUG_LUN) != CAM_REQ_CMP) { printf("xpt_config: xpt_create_path() failed for debug" Modified: projects/camlock/sys/cam/ctl/ctl_frontend_cam_sim.c ============================================================================== --- projects/camlock/sys/cam/ctl/ctl_frontend_cam_sim.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/cam/ctl/ctl_frontend_cam_sim.c Mon Apr 1 19:11:43 2013 (r248982) @@ -291,7 +291,7 @@ cfcs_onoffline(void *arg, int online) goto bailout; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(softc->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { printf("%s: can't allocate path for rescan\n", __func__); Modified: projects/camlock/sys/cam/scsi/scsi_xpt.c ============================================================================== --- projects/camlock/sys/cam/scsi/scsi_xpt.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/cam/scsi/scsi_xpt.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1953,7 +1953,7 @@ scsi_scan_bus(struct cam_periph *periph, if (i == initiator_id) continue; - status = xpt_create_path(&path, xpt_periph, + status = xpt_create_path(&path, NULL, request_ccb->ccb_h.path_id, i, 0); if (status != CAM_REQ_CMP) { @@ -2154,7 +2154,7 @@ scsi_scan_bus(struct cam_periph *periph, xpt_free_ccb(request_ccb); break; } - status = xpt_create_path(&path, xpt_periph, + status = xpt_create_path(&path, NULL, scan_info->request_ccb->ccb_h.path_id, scan_info->counter, 0); if (status != CAM_REQ_CMP) { @@ -2177,7 +2177,7 @@ scsi_scan_bus(struct cam_periph *periph, request_ccb->crcn.flags = scan_info->request_ccb->crcn.flags; } else { - status = xpt_create_path(&path, xpt_periph, + status = xpt_create_path(&path, NULL, path_id, target_id, lun_id); /* * Free the old request path- we're done with it. We @@ -2250,7 +2250,7 @@ scsi_scan_lun(struct cam_periph *periph, "can't continue\n"); return; } - status = xpt_create_path(&new_path, xpt_periph, + status = xpt_create_path(&new_path, NULL, path->bus->path_id, path->target->target_id, path->device->lun_id); Modified: projects/camlock/sys/dev/aac/aac_cam.c ============================================================================== --- projects/camlock/sys/dev/aac/aac_cam.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/aac/aac_cam.c Mon Apr 1 19:11:43 2013 (r248982) @@ -129,7 +129,7 @@ aac_cam_rescan(struct aac_softc *sc, uin return; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(camsc->sim), target_id, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb); Modified: projects/camlock/sys/dev/arcmsr/arcmsr.c ============================================================================== --- projects/camlock/sys/dev/arcmsr/arcmsr.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/arcmsr/arcmsr.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1599,7 +1599,8 @@ static void arcmsr_rescan_lun(struct Ada if ((ccb = (union ccb *)xpt_alloc_ccb_nowait()) == NULL) return; - if (xpt_create_path(&path, xpt_periph, cam_sim_path(acb->psim), target, lun) != CAM_REQ_CMP) + if (xpt_create_path(&path, NULL, cam_sim_path(acb->psim), target, lun) + != CAM_REQ_CMP) { xpt_free_ccb(ccb); return; Modified: projects/camlock/sys/dev/ata/atapi-cam.c ============================================================================== --- projects/camlock/sys/dev/ata/atapi-cam.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/ata/atapi-cam.c Mon Apr 1 19:11:43 2013 (r248982) @@ -825,7 +825,7 @@ cam_rescan(struct cam_sim *sim) ccb = xpt_alloc_ccb_nowait(); if (ccb == NULL) return; - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(sim), + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb); return; Modified: projects/camlock/sys/dev/ciss/ciss.c ============================================================================== --- projects/camlock/sys/dev/ciss/ciss.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/ciss/ciss.c Mon Apr 1 19:11:43 2013 (r248982) @@ -2913,7 +2913,7 @@ ciss_cam_rescan_target(struct ciss_softc return; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]), target, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { ciss_printf(sc, "rescan failed (can't create path)\n"); Modified: projects/camlock/sys/dev/firewire/sbp.c ============================================================================== --- projects/camlock/sys/dev/firewire/sbp.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/firewire/sbp.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1086,7 +1086,7 @@ END_DEBUG sbp_xfer_free(xfer); if (sdev->path == NULL) - xpt_create_path(&sdev->path, xpt_periph, + xpt_create_path(&sdev->path, NULL, cam_sim_path(target->sbp->sim), target->target_id, sdev->lun_id); @@ -2039,7 +2039,7 @@ END_DEBUG if (xpt_bus_register(sbp->sim, dev, /*bus*/0) != CAM_SUCCESS) goto fail; - if (xpt_create_path(&sbp->path, xpt_periph, cam_sim_path(sbp->sim), + if (xpt_create_path(&sbp->path, NULL, cam_sim_path(sbp->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_bus_deregister(cam_sim_path(sbp->sim)); goto fail; Modified: projects/camlock/sys/dev/hpt27xx/osm_bsd.c ============================================================================== --- projects/camlock/sys/dev/hpt27xx/osm_bsd.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/hpt27xx/osm_bsd.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1347,7 +1347,7 @@ static int hpt_rescan_bus(void) #endif ldm_for_each_vbus(vbus, vbus_ext) { - if (xpt_create_path(&path, xpt_periph, cam_sim_path(vbus_ext->sim), + if (xpt_create_path(&path, NULL, cam_sim_path(vbus_ext->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) return(EIO); if ((ccb = malloc(sizeof(union ccb), M_TEMP, M_WAITOK)) == NULL) Modified: projects/camlock/sys/dev/hptiop/hptiop.c ============================================================================== --- projects/camlock/sys/dev/hptiop/hptiop.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/hptiop/hptiop.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1437,7 +1437,7 @@ static int hptiop_rescan_bus(struct hpt if ((ccb = xpt_alloc_ccb()) == NULL) return(ENOMEM); - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(hba->sim), + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(hba->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb); return(EIO); Modified: projects/camlock/sys/dev/hptrr/hptrr_osm_bsd.c ============================================================================== --- projects/camlock/sys/dev/hptrr/hptrr_osm_bsd.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/hptrr/hptrr_osm_bsd.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1355,7 +1355,7 @@ static int hpt_rescan_bus(void) ldm_for_each_vbus(vbus, vbus_ext) { if ((ccb = xpt_alloc_ccb()) == NULL) return(ENOMEM); - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(vbus_ext->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb); Modified: projects/camlock/sys/dev/isci/isci_controller.c ============================================================================== --- projects/camlock/sys/dev/isci/isci_controller.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/isci/isci_controller.c Mon Apr 1 19:11:43 2013 (r248982) @@ -580,7 +580,7 @@ void isci_controller_domain_discovery_co */ union ccb *ccb = xpt_alloc_ccb_nowait(); - xpt_create_path(&ccb->ccb_h.path, xpt_periph, + xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(isci_controller->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); Modified: projects/camlock/sys/dev/isci/isci_domain.c ============================================================================== --- projects/camlock/sys/dev/isci/isci_domain.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/isci/isci_domain.c Mon Apr 1 19:11:43 2013 (r248982) @@ -300,7 +300,7 @@ scif_cb_domain_device_removed(SCI_CONTRO isci_controller->remote_device[isci_remote_device->index] = NULL; - xpt_create_path(&ccb->ccb_h.path, xpt_periph, path, + xpt_create_path(&ccb->ccb_h.path, NULL, path, isci_remote_device->index, CAM_LUN_WILDCARD); xpt_rescan(ccb); Modified: projects/camlock/sys/dev/isci/isci_remote_device.c ============================================================================== --- projects/camlock/sys/dev/isci/isci_remote_device.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/isci/isci_remote_device.c Mon Apr 1 19:11:43 2013 (r248982) @@ -83,7 +83,7 @@ scif_cb_remote_device_ready(SCI_CONTROLL */ union ccb *ccb = xpt_alloc_ccb_nowait(); - xpt_create_path(&ccb->ccb_h.path, xpt_periph, + xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(isci_controller->sim), isci_remote_device->index, CAM_LUN_WILDCARD); @@ -262,7 +262,7 @@ isci_remote_device_freeze_lun_queue(stru if (!(remote_device->frozen_lun_mask & (1 << lun))) { struct cam_path *path; - xpt_create_path(&path, xpt_periph, + xpt_create_path(&path, NULL, cam_sim_path(remote_device->domain->controller->sim), remote_device->index, lun); xpt_freeze_devq(path, 1); @@ -279,7 +279,7 @@ isci_remote_device_release_lun_queue(str struct cam_path *path; remote_device->frozen_lun_mask &= ~(1 << lun); - xpt_create_path(&path, xpt_periph, + xpt_create_path(&path, NULL, cam_sim_path(remote_device->domain->controller->sim), remote_device->index, lun); xpt_release_devq(path, 1, TRUE); Modified: projects/camlock/sys/dev/iscsi/initiator/isc_cam.c ============================================================================== --- projects/camlock/sys/dev/iscsi/initiator/isc_cam.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/iscsi/initiator/isc_cam.c Mon Apr 1 19:11:43 2013 (r248982) @@ -150,7 +150,7 @@ ic_scan(isc_session_t *sp) sp->flags |= ISC_SCANWAIT; CAM_LOCK(sp); - if(xpt_create_path(&sp->cam_path, xpt_periph, cam_sim_path(sp->cam_sim), + if(xpt_create_path(&sp->cam_path, NULL, cam_sim_path(sp->cam_sim), 0, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xdebug("can't create cam path"); CAM_UNLOCK(sp); Modified: projects/camlock/sys/dev/isp/isp_freebsd.c ============================================================================== --- projects/camlock/sys/dev/isp/isp_freebsd.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/isp/isp_freebsd.c Mon Apr 1 19:11:43 2013 (r248982) @@ -4554,7 +4554,8 @@ isp_make_here(ispsoftc_t *isp, int chan, isp_prt(isp, ISP_LOGWARN, "Chan %d unable to alloc CCB for rescan", chan); return; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(fc->sim), tgt, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(fc->sim), + tgt, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { isp_prt(isp, ISP_LOGWARN, "unable to create path for rescan"); xpt_free_ccb(ccb); return; Modified: projects/camlock/sys/dev/mfi/mfi_cam.c ============================================================================== --- projects/camlock/sys/dev/mfi/mfi_cam.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/mfi/mfi_cam.c Mon Apr 1 19:11:43 2013 (r248982) @@ -318,7 +318,7 @@ mfip_cam_rescan(struct mfi_softc *sc, ui } sim = camsc->sim; - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(sim), + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sim), tid, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb); device_printf(sc->mfi_dev, Modified: projects/camlock/sys/dev/mly/mly.c ============================================================================== --- projects/camlock/sys/dev/mly/mly.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/mly/mly.c Mon Apr 1 19:11:43 2013 (r248982) @@ -2025,7 +2025,7 @@ mly_cam_rescan_btl(struct mly_softc *sc, mly_printf(sc, "rescan failed (can't allocate CCB)\n"); return; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sc->mly_cam_sim[bus]), target, 0) != CAM_REQ_CMP) { mly_printf(sc, "rescan failed (can't create path)\n"); xpt_free_ccb(ccb); Modified: projects/camlock/sys/dev/mps/mps_sas.c ============================================================================== --- projects/camlock/sys/dev/mps/mps_sas.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/mps/mps_sas.c Mon Apr 1 19:11:43 2013 (r248982) @@ -271,7 +271,7 @@ mpssas_rescan_target(struct mps_softc *s return; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, pathid, + if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid, targetid, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { mps_dprint(sc, MPS_FAULT, "unable to create path for rescan\n"); xpt_free_ccb(ccb); @@ -3318,7 +3318,7 @@ mpssas_check_eedp(struct mpssas_softc *s return; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid, targetid, lunid) != CAM_REQ_CMP) { mps_dprint(sc, MPS_FAULT, "Unable to create " "path for EEDP support\n"); Modified: projects/camlock/sys/dev/mpt/mpt_cam.c ============================================================================== --- projects/camlock/sys/dev/mpt/mpt_cam.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/mpt/mpt_cam.c Mon Apr 1 19:11:43 2013 (r248982) @@ -2364,7 +2364,7 @@ mpt_cam_event(struct mpt_softc *mpt, req break; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, pathid, + if (xpt_create_path(&ccb->ccb_h.path, NULL, pathid, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { mpt_prt(mpt, "unable to create path for rescan\n"); xpt_free_ccb(ccb); @@ -2512,7 +2512,7 @@ mpt_cam_event(struct mpt_softc *mpt, req "unable to alloc CCB for rescan\n"); break; } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sim), psdsc->TargetID, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { mpt_prt(mpt, Modified: projects/camlock/sys/dev/mpt/mpt_raid.c ============================================================================== --- projects/camlock/sys/dev/mpt/mpt_raid.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/mpt/mpt_raid.c Mon Apr 1 19:11:43 2013 (r248982) @@ -705,7 +705,7 @@ mpt_raid_thread(void *arg) ccb = xpt_alloc_ccb(); MPT_LOCK(mpt); - error = xpt_create_path(&ccb->ccb_h.path, xpt_periph, + error = xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(mpt->phydisk_sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); if (error != CAM_REQ_CMP) { @@ -1662,7 +1662,7 @@ mpt_raid_set_vol_queue_depth(struct mpt_ mpt->raid_rescan = 0; - error = xpt_create_path(&path, xpt_periph, + error = xpt_create_path(&path, NULL, cam_sim_path(mpt->sim), mpt_vol->config_page->VolumeID, /*lun*/0); Modified: projects/camlock/sys/dev/twa/tw_osl_cam.c ============================================================================== --- projects/camlock/sys/dev/twa/tw_osl_cam.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/twa/tw_osl_cam.c Mon Apr 1 19:11:43 2013 (r248982) @@ -488,7 +488,7 @@ tw_osli_request_bus_scan(struct twa_soft if ((ccb = xpt_alloc_ccb()) == NULL) return(ENOMEM); mtx_lock(sc->sim_lock); - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(sc->sim), + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sc->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb); mtx_unlock(sc->sim_lock); Modified: projects/camlock/sys/dev/tws/tws_cam.c ============================================================================== --- projects/camlock/sys/dev/tws/tws_cam.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/tws/tws_cam.c Mon Apr 1 19:11:43 2013 (r248982) @@ -221,7 +221,7 @@ tws_bus_scan(struct tws_softc *sc) if ((ccb = xpt_alloc_ccb()) == NULL) return(ENOMEM); - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(sc->sim), + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sc->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb); return(EIO); Modified: projects/camlock/sys/dev/virtio/scsi/virtio_scsi.c ============================================================================== --- projects/camlock/sys/dev/virtio/scsi/virtio_scsi.c Mon Apr 1 17:32:52 2013 (r248981) +++ projects/camlock/sys/dev/virtio/scsi/virtio_scsi.c Mon Apr 1 19:11:43 2013 (r248982) @@ -1702,7 +1702,7 @@ vtscsi_execute_rescan(struct vtscsi_soft return; } - status = xpt_create_path(&ccb->ccb_h.path, xpt_periph, + status = xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(sc->vtscsi_sim), target_id, lun_id); if (status != CAM_REQ_CMP) { xpt_free_ccb(ccb);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304011911.r31JBiSE078444>