From owner-p4-projects@FreeBSD.ORG  Tue Mar 27 05:11:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 24D0116A404; Tue, 27 Mar 2007 05:11:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E2A6116A401
	for <perforce@freebsd.org>; Tue, 27 Mar 2007 05:11:32 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id D2FE113C45D
	for <perforce@freebsd.org>; Tue, 27 Mar 2007 05:11:32 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2R5BWYd083892
	for <perforce@freebsd.org>; Tue, 27 Mar 2007 05:11:32 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2R5BWpO083881
	for perforce@freebsd.org; Tue, 27 Mar 2007 05:11:32 GMT
	(envelope-from scottl@freebsd.org)
Date: Tue, 27 Mar 2007 05:11:32 GMT
Message-Id: <200703270511.l2R5BWpO083881@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 116626 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Mar 2007 05:11:33 -0000

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

Change 116626 by scottl@scottl-x64 on 2007/03/27 05:10:35

	Remove spls from scsi_pass.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#20 edit

Differences ...

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

@@ -326,7 +326,6 @@
 	struct cam_periph *periph;
 	struct pass_softc *softc;
 	int error;
-	int s;
 
 	error = 0; /* default to no error */
 
@@ -338,9 +337,7 @@
 
 	softc = (struct pass_softc *)periph->softc;
 
-	s = splsoftcam();
 	if (softc->flags & PASS_FLAG_INVALID) {
-		splx(s);
 		cam_periph_unlock(periph);
 		cam_periph_release(periph);
 		return(ENXIO);
@@ -351,7 +348,6 @@
 	 */
 	error = securelevel_gt(td->td_ucred, 1);
 	if (error) {
-		splx(s);
 		cam_periph_unlock(periph);
 		cam_periph_release(periph);
 		return(error);
@@ -361,7 +357,6 @@
 	 * Only allow read-write access.
 	 */
 	if (((flags & FWRITE) == 0) || ((flags & FREAD) == 0)) {
-		splx(s);
 		cam_periph_unlock(periph);
 		cam_periph_release(periph);
 		return(EPERM);
@@ -372,14 +367,11 @@
 	 */
 	if ((flags & O_NONBLOCK) != 0) {
 		xpt_print(periph->path, "can't do nonblocking access\n");
-		splx(s);
 		cam_periph_unlock(periph);
 		cam_periph_release(periph);
 		return(EINVAL);
 	}
 
-	splx(s);
-
 	if ((softc->flags & PASS_FLAG_OPEN) == 0) {
 		softc->flags |= PASS_FLAG_OPEN;
 	} else {
@@ -417,18 +409,15 @@
 passstart(struct cam_periph *periph, union ccb *start_ccb)
 {
 	struct pass_softc *softc;
-	int s;
 
 	softc = (struct pass_softc *)periph->softc;
 
 	switch (softc->state) {
 	case PASS_STATE_NORMAL:
-		s = splbio();
 		start_ccb->ccb_h.ccb_type = PASS_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);
 		break;
 	}