From owner-svn-src-head@FreeBSD.ORG  Thu Feb  5 15:09:05 2009
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 37F57106566C;
	Thu,  5 Feb 2009 15:09:05 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25EDD8FC1B;
	Thu,  5 Feb 2009 15:09:05 +0000 (UTC)
	(envelope-from attilio@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 n15F954P030327;
	Thu, 5 Feb 2009 15:09:05 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n15F94bL030325;
	Thu, 5 Feb 2009 15:09:04 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <200902051509.n15F94bL030325@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Thu, 5 Feb 2009 15:09:04 +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: r188152 - in head: share/man/man9 sys/sys
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: Thu, 05 Feb 2009 15:09:05 -0000

Author: attilio
Date: Thu Feb  5 15:09:04 2009
New Revision: 188152
URL: http://svn.freebsd.org/changeset/base/188152

Log:
  Remove the assertive KA_HELD and KA_UNHELD as long as they are dangerous,
  and not really helpful.

Modified:
  head/share/man/man9/lock.9
  head/sys/sys/lockmgr.h

Modified: head/share/man/man9/lock.9
==============================================================================
--- head/share/man/man9/lock.9	Thu Feb  5 15:04:23 2009	(r188151)
+++ head/share/man/man9/lock.9	Thu Feb  5 15:09:04 2009	(r188152)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 12, 2008
+.Dd February 05, 2009
 .Dt LOCK 9
 .Os
 .Sh NAME
@@ -279,14 +279,6 @@ lock pointed to by the first argument.
 Assert that the current thread has no lock on the
 .Vt lkp
 lock pointed to by the first argument.
-.It Dv KA_HELD
-Assert that an unspecified thread has a lock on the
-.Vt lkp
-lock pointed to by the first argument.
-.It Dv KA_UNHELD
-Assert that no thread has a lock on the
-.Vt lkp
-lock pointed to by the first argument.
 .El
 .Pp
 In addition, one of the following optional assertions can be used with
@@ -305,15 +297,6 @@ Assert that the current thread does not 
 .Fa lkp .
 .El
 .Pp
-Note that
-.Dv KA_HELD
-and
-.Dv KA_UNHELD
-usage is highly discouraged.
-They are intended to cater a bad behaviour
-introduced by buffer cache lock handling.
-They will hopefully be
-made useless by revisiting such locks.
 .Sh RETURN VALUES
 The
 .Fn lockmgr

Modified: head/sys/sys/lockmgr.h
==============================================================================
--- head/sys/sys/lockmgr.h	Thu Feb  5 15:04:23 2009	(r188151)
+++ head/sys/sys/lockmgr.h	Thu Feb  5 15:09:04 2009	(r188152)
@@ -183,8 +183,6 @@ _lockmgr_args_rw(struct lock *lk, u_int 
 #define	KA_UNLOCKED	LA_UNLOCKED
 #define	KA_RECURSED	LA_RECURSED
 #define	KA_NOTRECURSED	LA_NOTRECURSED
-#define	KA_HELD
-#define	KA_UNHELD
 #endif
 
 #endif /* _KERNEL */