From owner-svn-src-all@FreeBSD.ORG  Thu Feb 21 02:34:05 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2185AFC2;
 Thu, 21 Feb 2013 02:34:05 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 141B0C3F;
 Thu, 21 Feb 2013 02:34:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1L2Y4Lv031842;
 Thu, 21 Feb 2013 02:34:04 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1L2Y4a4031841;
 Thu, 21 Feb 2013 02:34:04 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201302210234.r1L2Y4a4031841@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 21 Feb 2013 02:34:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247069 - head/sys/dev/mcd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2013 02:34:05 -0000

Author: imp
Date: Thu Feb 21 02:34:04 2013
New Revision: 247069
URL: http://svnweb.freebsd.org/changeset/base/247069

Log:
  The other giant locked storage drivers have removed splbio(), for the
  most part, so remove it here too. Anybody locking this driver will need
  far more than locks where splbio() were, so remove these nops.

Modified:
  head/sys/dev/mcd/mcd.c

Modified: head/sys/dev/mcd/mcd.c
==============================================================================
--- head/sys/dev/mcd/mcd.c	Thu Feb 21 00:40:08 2013	(r247068)
+++ head/sys/dev/mcd/mcd.c	Thu Feb 21 02:34:04 2013	(r247069)
@@ -289,7 +289,6 @@ static void
 mcdstrategy(struct bio *bp)
 {
 	struct mcd_softc *sc;
-	int s;
 
 	sc = (struct mcd_softc *)bp->bio_dev->si_drv1;
 
@@ -318,9 +317,7 @@ mcdstrategy(struct bio *bp)
 	bp->bio_resid = 0;
 
 	/* queue it */
-	s = splbio();
 	bioq_disksort(&sc->data.head, bp);
-	splx(s);
 
 	/* now check whether we can perform processing */
 	mcd_start(sc);
@@ -338,10 +335,8 @@ static void
 mcd_start(struct mcd_softc *sc)
 {
 	struct bio *bp;
-	int s = splbio();
 
 	if (sc->data.flags & MCDMBXBSY) {
-		splx(s);
 		return;
 	}
 
@@ -350,10 +345,8 @@ mcd_start(struct mcd_softc *sc)
 		/* block found to process, dequeue */
 		/*MCD_TRACE("mcd_start: found block bp=0x%x\n",bp,0,0,0);*/
 		sc->data.flags |= MCDMBXBSY;
-		splx(s);
 	} else {
 		/* nothing to do */
-		splx(s);
 		return;
 	}