lock.9: lockcount() and lockcountnb() were removed in 3b6a19b26fb9c0e7918.
authorSascha Wildner <saw@online.de>
Sat, 25 Nov 2017 14:20:17 +0000 (15:20 +0100)
committerSascha Wildner <saw@online.de>
Sat, 25 Nov 2017 14:20:17 +0000 (15:20 +0100)
Makefile_upgrade.inc
share/man/man9/Makefile
share/man/man9/lock.9

index 71fbf0c..6be443d 100644 (file)
@@ -3351,6 +3351,8 @@ TO_REMOVE+=/usr/share/man/man5/x509v3_config.5.gz
 TO_REMOVE+=/usr/include/panel.h
 TO_REMOVE+=/usr/include/cpu/coredump.h
 TO_REMOVE+=/usr/include/machine/coredump.h
+TO_REMOVE+=/usr/share/man/man9/lockcount.9.gz
+TO_REMOVE+=/usr/share/man/man9/lockcountnb.9.gz
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index 07d5ec1..75a1be2 100644 (file)
@@ -622,9 +622,7 @@ MLINKS+=ktr.9 KTR_COND_LOG.9 \
        ktr.9 KTR_INFO_MASTER_EXTERN.9 \
        ktr.9 KTR_LOG.9
 MLINKS+=kether_ntoa.9 kether_aton.9
-MLINKS+=lock.9 lockcount.9 \
-       lock.9 lockcountnb.9 \
-       lock.9 lockinit.9 \
+MLINKS+=lock.9 lockinit.9 \
        lock.9 lockmgr.9 \
        lock.9 lockmgr_printinfo.9 \
        lock.9 lockowned.9 \
index b03776a..fe244df 100644 (file)
 .\"
 .\" $FreeBSD: src/share/man/man9/lock.9,v 1.11 2003/09/08 19:57:21 ru Exp $
 .\"
-.Dd January 19, 2014
+.Dd November 25, 2017
 .Dt LOCK 9
 .Os
 .Sh NAME
 .Nm lockinit ,
-.Nm lockcount ,
 .Nm lockmgr ,
 .Nm lockstatus ,
 .Nm lockmgr_printinfo ,
 .Ft void
 .Fn lockuninit "struct lock *lkp"
 .Ft int
-.Fn lockcount "struct lock *lkp"
-.Ft int
-.Fn lockcountnb "struct lock *lkp"
-.Ft int
 .Fn lockmgr "struct lock *lkp" "u_int flags"
 .Ft int
 .Fn lockstatus "struct lock *lkp" "struct thread *td"
@@ -94,19 +89,6 @@ function destroys a lock that was previously initialized using
 .Fn lockinit .
 .Pp
 The
-.Fn lockcount
-function returns a count of the number of exclusive locks and shared locks
-held against the lock
-.Fa lkp .
-.Pp
-The
-.Fn lockcountnb
-function is a non-blocking counter-part of
-.Fn lockcount .
-which, can be safely used in assertion statements e.g. a
-.Xr KASSERT 9 .
-.Pp
-The
 .Fn lockmgr
 function handles general locking functionality within the kernel, including
 support for shared and exclusive locks, and recursion.
@@ -196,10 +178,6 @@ The
 function is used to determine whether the calling thread owns a lock.
 .Sh RETURN VALUES
 The
-.Fn lockcount
-function returns an integer greater than or equal to zero.
-.Pp
-The
 .Fn lockmgr
 function returns 0 on success and non-zero on failure.
 .Pp