Trimm out now unused option LK_EXCLUPGRADE from the lockmgr namespace.

This option just adds complexity and the new implementation no longer
will support it, so axing it now that it is unused is probabilly the
better idea.

FreeBSD version is bumped in order to reflect the KPI breakage introduced
by this patch.

In the ports tree, kris found that only old OSKit code uses it, but as
it is thought to work only on 2.x kernels serie, version bumping will
solve any problem.

2 files changed, 5 insertions, 15 deletions

diff --git a/share/man/man9/VOP_LOCK.9 b/share/man/man9/VOP_LOCK.9
index c519e46..36fbe4e 100644
--- a/share/man/man9/VOP_LOCK.9
+++ b/share/man/man9/VOP_LOCK.9
@@ -61,15 +61,13 @@ The vnode being locked or unlocked.
 .It Fa flags
 One of the lock request types:
 .Pp
-.Bl -tag -width ".Dv LK_EXCLUPGRADE" -offset indent -compact
+.Bl -tag -width ".Dv LK_CANRECURSE" -offset indent -compact
 .It Dv LK_SHARED
 Shared lock.
 .It Dv LK_EXCLUSIVE
 Exclusive lock.
 .It Dv LK_UPGRADE
 Shared-to-exclusive upgrade.
-.It Dv LK_EXCLUPGRADE
-First shared-to-exclusive upgrade.
 .It Dv LK_DOWNGRADE
 Exclusive-to-shared downgrade.
 .It Dv LK_RELEASE
@@ -82,7 +80,7 @@ The lock type may be
 .Em or Ns 'ed
 with these lock flags:
 .Pp
-.Bl -tag -width ".Dv LK_EXCLUPGRADE" -offset indent -compact
+.Bl -tag -width ".Dv LK_CANRECURSE" -offset indent -compact
 .It Dv LK_NOWAIT
 Do not sleep to wait for lock.
 .It Dv LK_SLEEPFAIL
@@ -95,7 +93,7 @@ The lock type may be
 .Em or Ns 'ed
 with these control flags:
 .Pp
-.Bl -tag -width ".Dv LK_EXCLUPGRADE" -offset indent -compact
+.Bl -tag -width ".Dv LK_CANRECURSE" -offset indent -compact
 .It Dv LK_INTERLOCK
 Specify when the caller already has a simple lock
 .Fn ( VOP_LOCK
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index 5968745..ee73335 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 20, 2006
+.Dd December 27, 2007
 .Dt LOCK 9
 .Os
 .Sh NAME
@@ -113,7 +113,7 @@ Its arguments are:
 A pointer to the lock to manipulate.
 .It Fa flags
 Flags indicating what action is to be taken.
-.Bl -tag -width ".Dv LK_EXCLUPGRADE"
+.Bl -tag -width ".Dv LK_CANRECURSE"
 .It Dv LK_SHARED
 Acquire a shared lock.
 If an exclusive lock is currently held, it will be downgraded.
@@ -127,14 +127,6 @@ is not set, the system will
 Downgrade exclusive lock to a shared lock.
 Downgrading a shared lock is not permitted.
 If an exclusive lock has been recursed, all references will be downgraded.
-.It Dv LK_EXCLUPGRADE
-Upgrade a shared lock to an exclusive lock.
-Fails with
-.Er EBUSY
-if there is someone ahead of you in line waiting for an upgrade.
-If this call fails, the shared lock is lost.
-Attempts to upgrade an exclusive lock will cause a
-.Xr panic 9 .
 .It Dv LK_UPGRADE
 Upgrade a shared lock to an exclusive lock.
 If this call fails, the shared lock is lost.