From owner-svn-src-projects@FreeBSD.ORG  Mon Aug 12 15:35:10 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A90B485B;
 Mon, 12 Aug 2013 15:35:10 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9704D275F;
 Mon, 12 Aug 2013 15:35:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7CFZAmL053701;
 Mon, 12 Aug 2013 15:35:10 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7CFZAYd053700;
 Mon, 12 Aug 2013 15:35:10 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201308121535.r7CFZAYd053700@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 12 Aug 2013 15:35:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254250 - projects/camlock/sys/cam/scsi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 12 Aug 2013 15:35:10 -0000

Author: mav
Date: Mon Aug 12 15:35:10 2013
New Revision: 254250
URL: http://svnweb.freebsd.org/changeset/base/254250

Log:
  Switch targ(4) to using new per-device lock.

Modified:
  projects/camlock/sys/cam/scsi/scsi_target.c

Modified: projects/camlock/sys/cam/scsi/scsi_target.c
==============================================================================
--- projects/camlock/sys/cam/scsi/scsi_target.c	Mon Aug 12 14:30:11 2013	(r254249)
+++ projects/camlock/sys/cam/scsi/scsi_target.c	Mon Aug 12 15:35:10 2013	(r254250)
@@ -236,7 +236,6 @@ targioctl(struct cdev *dev, u_long cmd, 
 	{
 		struct ioc_enable_lun	*new_lun;
 		struct cam_path		*path;
-		struct cam_sim		*sim;
 
 		new_lun = (struct ioc_enable_lun *)addr;
 		status = xpt_create_path(&path, /*periph*/NULL,
@@ -247,12 +246,11 @@ targioctl(struct cdev *dev, u_long cmd, 
 			printf("Couldn't create path, status %#x\n", status);
 			break;
 		}
-		sim = xpt_path_sim(path);
-		mtx_lock(sim->mtx);
+		xpt_path_lock(path);
 		status = targenable(softc, path, new_lun->grp6_len,
 				    new_lun->grp7_len);
+		xpt_path_unlock(path);
 		xpt_free_path(path);
-		mtx_unlock(sim->mtx);
 		break;
 	}
 	case TARGIOCDISABLE: