5c5
< __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_low.c 198356 2009-10-22 06:13:07Z brueffer $");
---
> __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_low.c 203108 2010-01-28 08:41:30Z mav $");
898,899d897
< static void scsi_low_cam_rescan_callback(struct cam_periph *, union ccb *);
< static void scsi_low_rescan_bus_cam(struct scsi_low_softc *);
957,988d954
< static void
< scsi_low_cam_rescan_callback(periph, ccb)
< struct cam_periph *periph;
< union ccb *ccb;
< {
<
< xpt_free_path(ccb->ccb_h.path);
< xpt_free_ccb(ccb);
< }
<
< static void
< scsi_low_rescan_bus_cam(slp)
< struct scsi_low_softc *slp;
< {
< struct cam_path *path;
< union ccb *ccb;
< cam_status status;
<
< status = xpt_create_path(&path, xpt_periph,
< cam_sim_path(slp->sl_si.sim), -1, 0);
< if (status != CAM_REQ_CMP)
< return;
<
< ccb = xpt_alloc_ccb();
< bzero(ccb, sizeof(union ccb));
< xpt_setup_ccb(&ccb->ccb_h, path, 5);
< ccb->ccb_h.func_code = XPT_SCAN_BUS;
< ccb->ccb_h.cbfcnp = scsi_low_cam_rescan_callback;
< ccb->crcn.flags = CAM_FLAG_NONE;
< xpt_action(ccb);
< }
<
1379,1380d1344
< if (!cold)
< scsi_low_rescan_bus_cam(slp);