From owner-svn-src-head@FreeBSD.ORG Tue Nov 11 22:59:41 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 7A8C41065677;
Tue, 11 Nov 2008 22:59:41 +0000 (UTC)
(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 6367B8FC13;
Tue, 11 Nov 2008 22:59:41 +0000 (UTC)
(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mABMxfYK013555;
Tue, 11 Nov 2008 22:59:41 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id mABMxf15013554;
Tue, 11 Nov 2008 22:59:41 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200811112259.mABMxf15013554@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 11 Nov 2008 22:59:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r184857 - head/sys/security/audit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Nov 2008 22:59:41 -0000
Author: rwatson
Date: Tue Nov 11 22:59:40 2008
New Revision: 184857
URL: http://svn.freebsd.org/changeset/base/184857
Log:
Minor style tweaks and change lock name string to use _'s and not spaces
to improve parseability.
Modified:
head/sys/security/audit/audit.c
Modified: head/sys/security/audit/audit.c
==============================================================================
--- head/sys/security/audit/audit.c Tue Nov 11 21:57:03 2008 (r184856)
+++ head/sys/security/audit/audit.c Tue Nov 11 22:59:40 2008 (r184857)
@@ -166,7 +166,8 @@ static struct cv audit_fail_cv;
static struct auditinfo_addr audit_kinfo;
static struct rwlock audit_kinfo_lock;
-#define KINFO_LOCK_INIT() rw_init(&audit_kinfo_lock, "kernel audit info lock")
+#define KINFO_LOCK_INIT() rw_init(&audit_kinfo_lock, \
+ "audit_kinfo_lock")
#define KINFO_RLOCK() rw_rlock(&audit_kinfo_lock)
#define KINFO_WLOCK() rw_wlock(&audit_kinfo_lock)
#define KINFO_RUNLOCK() rw_runlock(&audit_kinfo_lock)
@@ -179,6 +180,7 @@ audit_set_kinfo(struct auditinfo_addr *a
KASSERT(ak->ai_termid.at_type == AU_IPv4 ||
ak->ai_termid.at_type == AU_IPv6,
("audit_set_kinfo: invalid address type"));
+
KINFO_WLOCK();
audit_kinfo = *ak;
KINFO_WUNLOCK();
@@ -191,6 +193,7 @@ audit_get_kinfo(struct auditinfo_addr *a
KASSERT(audit_kinfo.ai_termid.at_type == AU_IPv4 ||
audit_kinfo.ai_termid.at_type == AU_IPv6,
("audit_set_kinfo: invalid address type"));
+
KINFO_RLOCK();
*ak = audit_kinfo;
KINFO_RUNLOCK();