PERFORCE change 118146 for review

Scott Long scottl at FreeBSD.org
Sun Apr 15 08:01:30 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=118146

Change 118146 by scottl at scottl-x64 on 2007/04/15 08:01:17

	Remove lingering spls

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#13 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#9 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#13 (text+ko) ====

@@ -485,13 +485,11 @@
 static void
 sesstart(struct cam_periph *p, union ccb *sccb)
 {
-	int s = splbio();
 	if (p->immediate_priority <= p->pinfo.priority) {
 		SLIST_INSERT_HEAD(&p->ccb_list, &sccb->ccb_h, periph_links.sle);
 		p->immediate_priority = CAM_PRIORITY_NONE;
 		wakeup(&p->ccb_list);
 	}
-	splx(s);
 }
 
 static void

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#9 (text+ko) ====

@@ -463,27 +463,22 @@
 	struct targbh_cmd_desc *desc;
 	struct ccb_scsiio *csio;
 	ccb_flags flags;
-	int    s;
 
 	softc = (struct targbh_softc *)periph->softc;
 	
-	s = splbio();
 	ccbh = TAILQ_FIRST(&softc->work_queue);
 	if (periph->immediate_priority <= periph->pinfo.priority) {
 		start_ccb->ccb_h.ccb_type = TARGBH_CCB_WAITING;			
 		SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
 				  periph_links.sle);
 		periph->immediate_priority = CAM_PRIORITY_NONE;
-		splx(s);
 		wakeup(&periph->ccb_list);
 	} else if (ccbh == NULL) {
-		splx(s);
 		xpt_release_ccb(start_ccb);	
 	} else {
 		TAILQ_REMOVE(&softc->work_queue, ccbh, periph_links.tqe);
 		TAILQ_INSERT_HEAD(&softc->pending_queue, ccbh,
 				  periph_links.tqe);
-		splx(s);	
 		atio = (struct ccb_accept_tio*)ccbh;
 		desc = (struct targbh_cmd_desc *)atio->ccb_h.ccb_descr;
 
@@ -544,9 +539,7 @@
 					 /*getcount_only*/0); 
 			atio->ccb_h.status &= ~CAM_DEV_QFRZN;
 		}
-		s = splbio();
 		ccbh = TAILQ_FIRST(&softc->work_queue);
-		splx(s);
 	}
 	if (ccbh != NULL)
 		xpt_schedule(periph, /*priority*/1);


More information about the p4-projects mailing list