svn commit: r249030 - projects/camlock/sys/cam

[Alexander Motin]

Author: mav
Date: Tue Apr  2 19:07:11 2013
New Revision: 249030
URL: http://svnweb.freebsd.org/changeset/base/249030

Log:
  Remove two no longer needed checks.

Modified:
  projects/camlock/sys/cam/cam_xpt.c

Modified: projects/camlock/sys/cam/cam_xpt.c
==============================================================================
--- projects/camlock/sys/cam/cam_xpt.c	Tue Apr  2 17:34:42 2013	(r249029)
+++ projects/camlock/sys/cam/cam_xpt.c	Tue Apr  2 19:07:11 2013	(r249030)
@@ -2481,16 +2481,10 @@ xpt_action_default(union ccb *start_ccb)
 	case XPT_RESET_DEV:
 	case XPT_ENG_EXEC:
 	case XPT_SMP_IO:
-	{
-		int frozen;
-
-		frozen = cam_ccbq_insert_ccb(&path->device->ccbq, start_ccb);
-		if (frozen > 0)
-			xpt_run_dev_allocq(path->device);
+		cam_ccbq_insert_ccb(&path->device->ccbq, start_ccb);
 		if (xpt_schedule_devq(path->bus->sim->devq, path->device))
 			xpt_run_devq(path->bus->sim->devq);
 		break;
-	}
 	case XPT_CALC_GEOMETRY:
 	{
 		struct cam_sim *sim;
@@ -3244,7 +3238,7 @@ xpt_run_devq(struct cam_devq *devq)
 
 		xpt_schedule_devq(devq, device);
 
-		if (work_ccb && (work_ccb->ccb_h.flags & CAM_DEV_QFREEZE) != 0){
+		if ((work_ccb->ccb_h.flags & CAM_DEV_QFREEZE) != 0) {
 			/*
 			 * The client wants to freeze the queue
 			 * after this CCB is sent.