From owner-svn-src-projects@FreeBSD.ORG  Thu Aug 25 11:39:32 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 90293106566B;
	Thu, 25 Aug 2011 11:39:32 +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 806588FC14;
	Thu, 25 Aug 2011 11:39:32 +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 p7PBdWYr002020;
	Thu, 25 Aug 2011 11:39:32 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7PBdWbW002018;
	Thu, 25 Aug 2011 11:39:32 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201108251139.p7PBdWbW002018@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 25 Aug 2011 11:39:32 +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: r225174 - 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:39:32 -0000

Author: mav
Date: Thu Aug 25 11:39:32 2011
New Revision: 225174
URL: http://svn.freebsd.org/changeset/base/225174

Log:
  Drop the periph lock during M_WAITOK buffer allocation.

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

Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Thu Aug 25 11:02:01 2011	(r225173)
+++ projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Thu Aug 25 11:39:32 2011	(r225174)
@@ -744,8 +744,11 @@ enc_fsm_step(enc_softc_t *enc)
 	cur_state = &enc->enc_fsm_states[enc->current_action];
 
 	buf = NULL;
-	if (cur_state->buf_size != 0)
+	if (cur_state->buf_size != 0) {
+		cam_periph_unlock(enc->periph);
 		buf = malloc(cur_state->buf_size, M_SCSIENC, M_WAITOK|M_ZERO);
+		cam_periph_lock(enc->periph);
+	}
 
 	error = 0;
 	ccb   = NULL;