From owner-p4-projects@FreeBSD.ORG  Mon Dec  4 18:46:53 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE67A16A585; Mon,  4 Dec 2006 18:46:52 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C576E16A582
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 18:46:52 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 413BC43CC2
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 18:46:17 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IkpxG092765
	for <perforce@freebsd.org>; Mon, 4 Dec 2006 18:46:51 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IkpQE092757
	for perforce@freebsd.org; Mon, 4 Dec 2006 18:46:51 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 4 Dec 2006 18:46:51 GMT
Message-Id: <200612041846.kB4IkpQE092757@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111063 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 04 Dec 2006 18:46:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=111063

Change 111063 by millert@millert_g5tower on 2006/12/04 18:46:46

	Enable the sidtab spinlock.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#6 edit
.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#4 edit
.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#6 (text+ko) ====

@@ -26,11 +26,11 @@
 #include <sedarwin/ss/security.h>
 
 lck_grp_t *ss_lck_grp;
+lck_attr_t *ss_lck_attr;
 
 int security_init(void)
 {
 	lck_grp_attr_t *ss_lck_grp_attr;
-	lck_attr_t *ss_lck_attr;
 	void    *policy_data;
 	size_t   policy_len;
 	int rc;

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.c#4 (text+ko) ====

@@ -16,22 +16,15 @@
 #define SIDTAB_HASH(sid) \
 (sid & SIDTAB_HASH_MASK)
 
-#ifdef __FreeBSD__
-#define INIT_SIDTAB_LOCK(s) 					\
-  memset (&s->lock, 0, sizeof (struct mtx));			\
-  mtx_init (&s->lock, "SEBSD sidtab lock", NULL, MTX_DEF) 
+extern lck_grp_t *ss_lck_grp;
+extern lck_attr_t *ss_lck_attr;
 
-#define SIDTAB_LOCK(s) mtx_lock(&s->lock)
-#define SIDTAB_UNLOCK(s) mtx_unlock(&s->lock)
+#define INIT_SIDTAB_LOCK(s) do {					\
+	(s)->lock = lck_spin_alloc_init(ss_lck_grp, ss_lck_attr);	\
+} while (0)
 
-#else
-
-/* XXX - darwin locking */
-#define INIT_SIDTAB_LOCK(s) 
-#define SIDTAB_LOCK(s) 
-#define SIDTAB_UNLOCK(s) 
-
-#endif
+#define SIDTAB_LOCK(s) lck_spin_lock((s)->lock)
+#define SIDTAB_UNLOCK(s) lck_spin_unlock((s)->lock)
 
 int sidtab_init(struct sidtab *s)
 {

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/sidtab.h#3 (text+ko) ====

@@ -29,9 +29,7 @@
 	unsigned int nel;	/* number of elements */
 	unsigned int next_sid;	/* next SID to allocate */
 	unsigned char shutdown;
-#ifdef __FreeBSD__
-	spinlock_t lock;
-#endif
+	lck_spin_t *lock;
 };
 
 int sidtab_init(struct sidtab *s);