From owner-svn-src-projects@FreeBSD.ORG  Thu Aug 25 11:02:02 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A5861065673;
	Thu, 25 Aug 2011 11:02:02 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A7238FC16;
	Thu, 25 Aug 2011 11:02:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7PB22Oa000860;
	Thu, 25 Aug 2011 11:02:02 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7PB22w5000857;
	Thu, 25 Aug 2011 11:02:02 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201108251102.p7PB22w5000857@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 25 Aug 2011 11:02:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225173 - projects/zfsd/head/sys/cam/scsi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Aug 2011 11:02:02 -0000

Author: mav
Date: Thu Aug 25 11:02:01 2011
New Revision: 225173
URL: http://svn.freebsd.org/changeset/base/225173

Log:
  Remove some strange lock operations.

Modified:
  projects/zfsd/head/sys/cam/scsi/scsi_enc.c
  projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c

Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Thu Aug 25 10:00:38 2011	(r225172)
+++ projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Thu Aug 25 11:02:01 2011	(r225173)
@@ -242,10 +242,8 @@ enc_open(struct cdev *dev, int flags, in
 		return (ENXIO);
 	}
 
-	if (cam_periph_acquire(periph) != CAM_REQ_CMP) {
-		cam_periph_unlock(periph);
+	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
 		return (ENXIO);
-	}
 
 	cam_periph_lock(periph);
 
@@ -273,9 +271,6 @@ enc_close(struct cdev *dev, int flag, in
 {
 	struct cam_periph *periph;
 	struct enc_softc *softc;
-	int error;
-
-	error = 0;
 
 	periph = (struct cam_periph *)dev->si_drv1;
 	if (periph == NULL)

Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c
==============================================================================
--- projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c	Thu Aug 25 10:00:38 2011	(r225172)
+++ projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c	Thu Aug 25 11:02:01 2011	(r225173)
@@ -2563,8 +2563,6 @@ ses_set_enc_status(enc_softc_t *enc, uin
 	enc_update_request(enc, SES_PROCESS_CONTROL_REQS);
 	cam_periph_sleep(enc->periph, &req, PUSER, "encstat", 0);
 
-	sx_slock(&enc->enc_cache_lock);
-
 	return (req.result);
 }