diff options
| author | attilio <attilio@FreeBSD.org> | 2007-12-28 00:38:13 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2007-12-28 00:38:13 +0000 |
| commit | c720b77ca941958916f2c143cba3327d448ee08b (patch) | |
| tree | 6756c34c743d4bdd03e9bd87a198472dd71631fe /sys/kern/kern_lock.c | |
| parent | 15ff96944169ae56c4a2f3da912dc720eca4996c (diff) | |
| download | FreeBSD-src-c720b77ca941958916f2c143cba3327d448ee08b.zip FreeBSD-src-c720b77ca941958916f2c143cba3327d448ee08b.tar.gz | |
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.
Diffstat (limited to 'sys/kern/kern_lock.c')
| -rw-r--r-- | sys/kern/kern_lock.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index d4413de..8d1a219 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -299,19 +299,6 @@ _lockmgr(struct lock *lkp, u_int flags, struct mtx *interlkp, wakeup((void *)lkp); break; - case LK_EXCLUPGRADE: - /* - * If another process is ahead of us to get an upgrade, - * then we want to fail rather than have an intervening - * exclusive access. - */ - if (lkp->lk_flags & LK_WANT_UPGRADE) { - shareunlock(td, lkp, 1); - error = EBUSY; - break; - } - /* FALLTHROUGH normal upgrade */ - case LK_UPGRADE: /* * Upgrade a shared lock to an exclusive one. If another |
