From owner-p4-projects@FreeBSD.ORG  Sun Dec  6 11:41:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 354D01065672; Sun,  6 Dec 2009 11:41:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE0551065670
	for <perforce@freebsd.org>; Sun,  6 Dec 2009 11:41:02 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DB86F8FC18
	for <perforce@freebsd.org>; Sun,  6 Dec 2009 11:41:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6Bf2tu098000
	for <perforce@freebsd.org>; Sun, 6 Dec 2009 11:41:02 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6Bf2wu097998
	for perforce@freebsd.org; Sun, 6 Dec 2009 11:41:02 GMT
	(envelope-from mav@freebsd.org)
Date: Sun, 6 Dec 2009 11:41:02 GMT
Message-Id: <200912061141.nB6Bf2wu097998@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 171447 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 06 Dec 2009 11:41:03 -0000

http://p4web.freebsd.org/chv.cgi?CH=171447

Change 171447 by mav@mav_mavbook on 2009/12/06 11:40:06

	Reduce diff to HEAD.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#22 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#22 (text+ko) ====

@@ -178,9 +178,23 @@
 int		cam_periph_error(union ccb *ccb, cam_flags camflags,
 				 u_int32_t sense_flags, union ccb *save_ccb);
 
-#define cam_periph_lock(periph)		mtx_lock((periph)->sim->mtx)
-#define cam_periph_unlock(periph)	mtx_unlock((periph)->sim->mtx)
-#define cam_periph_owned(periph)	mtx_owned((periph)->sim->mtx)
+static __inline void
+cam_periph_lock(struct cam_periph *periph)
+{
+	mtx_lock(periph->sim->mtx);
+}
+
+static __inline void
+cam_periph_unlock(struct cam_periph *periph)
+{
+	mtx_unlock(periph->sim->mtx);
+}
+
+static __inline int
+cam_periph_owned(struct cam_periph *periph)
+{
+	return (mtx_owned(periph->sim->mtx));
+}
 
 #endif /* _KERNEL */
 #endif /* _CAM_CAM_PERIPH_H */