svn commit: r188152 - in head: share/man/man9 sys/sys
Attilio Rao
attilio at FreeBSD.org
Thu Feb 5 07:09:05 PST 2009
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 */
More information about the svn-src-all
mailing list