Author: mav
Date: Sat Oct 27 09:40:29 2012
New Revision: 242174
URL: http://svn.freebsd.org/changeset/base/242174
Log:
Remove several uses of numeric priorities from immediate CCB setups.
Modified:
head/sys/cam/ctl/ctl_frontend_cam_sim.c
head/sys/cam/ctl/scsi_ctl.c
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/ctl/ctl_frontend_cam_sim.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_cam_sim.c Sat Oct 27 08:52:33 2012
(r242173)
+++ head/sys/cam/ctl/ctl_frontend_cam_sim.c Sat Oct 27 09:40:29 2012
(r242174)
@@ -240,7 +240,7 @@ cfcs_init(void)
goto bailout;
}
- xpt_setup_ccb(&csa.ccb_h, softc->path, /*priority*/ 5);
+ xpt_setup_ccb(&csa.ccb_h, softc->path, CAM_PRIORITY_NONE);
csa.ccb_h.func_code = XPT_SASYNC_CB;
csa.event_enable = AC_LOST_DEVICE;
csa.callback = cfcs_async;
Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c Sat Oct 27 08:52:33 2012 (r242173)
+++ head/sys/cam/ctl/scsi_ctl.c Sat Oct 27 09:40:29 2012 (r242174)
@@ -334,7 +334,7 @@ ctlfeasync(void *callback_arg, uint32_t
return;
}
xpt_setup_ccb(&ccb->ccb_h, cpi->ccb_h.path,
- /*priority*/ 1);
+ CAM_PRIORITY_NONE);
sim = xpt_path_sim(cpi->ccb_h.path);
@@ -571,7 +571,7 @@ ctlferegister(struct cam_periph *periph,
callout_init_mtx(&softc->dma_callout, sim->mtx, /*flags*/ 0);
periph->softc = softc;
- xpt_setup_ccb(&en_lun_ccb.ccb_h, periph->path, /*priority*/ 1);
+ xpt_setup_ccb(&en_lun_ccb.ccb_h, periph->path, CAM_PRIORITY_NONE);
en_lun_ccb.ccb_h.func_code = XPT_EN_LUN;
en_lun_ccb.cel.grp6_len = 0;
en_lun_ccb.cel.grp7_len = 0;
@@ -668,7 +668,7 @@ ctlfeoninvalidate(struct cam_periph *per
softc = (struct ctlfe_lun_softc *)periph->softc;
- xpt_setup_ccb(&en_lun_ccb.ccb_h, periph->path, /*priority*/ 1);
+ xpt_setup_ccb(&en_lun_ccb.ccb_h, periph->path, CAM_PRIORITY_NONE);
en_lun_ccb.ccb_h.func_code = XPT_EN_LUN;
en_lun_ccb.cel.grp6_len = 0;
en_lun_ccb.cel.grp7_len = 0;
@@ -1694,7 +1694,7 @@ ctlfe_onoffline(void *arg, int online)
return;
}
ccb = (union ccb *)malloc(sizeof(*ccb), M_TEMP, M_WAITOK | M_ZERO);
- xpt_setup_ccb(&ccb->ccb_h, path, /*priority*/ 1);
+ xpt_setup_ccb(&ccb->ccb_h, path, CAM_PRIORITY_NONE);
sim = xpt_path_sim(path);
Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c Sat Oct 27 08:52:33 2012 (r242173)
+++ head/sys/cam/scsi/scsi_da.c Sat Oct 27 09:40:29 2012 (r242174)
@@ -1510,7 +1510,7 @@ dasysctlinit(void *context, int pending)
* Add some addressing info.
*/
memset(&cts, 0, sizeof (cts));
- xpt_setup_ccb(&cts.ccb_h, periph->path, /*priority*/1);
+ xpt_setup_ccb(&cts.ccb_h, periph->path, CAM_PRIORITY_NONE);
cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
cam_periph_lock(periph);
_______________________________________________
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"
