D4382.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4382.diff
View Options

	Index: sys/cam/cam_xpt.c
	===================================================================
	--- sys/cam/cam_xpt.c
	+++ sys/cam/cam_xpt.c
	@@ -2450,7 +2450,8 @@
	xpt_action(union ccb *start_ccb)
	{

	- CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_action\n"));
	+ CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE,
	+ ("xpt_action: func=%#x\n", start_ccb->ccb_h.func_code));

	start_ccb->ccb_h.status = CAM_REQ_INPROG;
	(*(start_ccb->ccb_h.path->bus->xport->action))(start_ccb);
	@@ -2464,7 +2465,8 @@
	int lock;

	path = start_ccb->ccb_h.path;
	- CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_action_default\n"));
	+ CAM_DEBUG(path, CAM_DEBUG_TRACE,
	+ ("xpt_action_default: func=%#x\n", start_ccb->ccb_h.func_code));

	switch (start_ccb->ccb_h.func_code) {
	case XPT_SCSI_IO:
	@@ -2618,7 +2620,11 @@
	lock = (mtx_owned(sim->mtx) == 0);
	if (lock)
	CAM_SIM_LOCK(sim);
	+ CAM_DEBUG(path, CAM_DEBUG_TRACE,
	+ ("sim->sim_action: func=%#x\n", start_ccb->ccb_h.func_code));
	(*(sim->sim_action))(sim, start_ccb);
	+ CAM_DEBUG(path, CAM_DEBUG_TRACE,
	+ ("sim->sim_action: status=%#x\n", start_ccb->ccb_h.status));
	if (lock)
	CAM_SIM_UNLOCK(sim);
	break;