Date: Fri, 5 Aug 2016 13:53:28 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303767 - in head: share/man/man9 sys/sys Message-ID: <201608051353.u75DrSMA085253@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Fri Aug 5 13:53:28 2016 New Revision: 303767 URL: https://svnweb.freebsd.org/changeset/base/303767 Log: Remove lockmgr_waiters(9) and BUF_LOCKWAITERS(9); they were not used for anything. Reviewed by: kib@ MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D7420 Modified: head/share/man/man9/Makefile head/share/man/man9/lock.9 head/sys/sys/buf.h head/sys/sys/lockmgr.h Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Fri Aug 5 09:08:00 2016 (r303766) +++ head/share/man/man9/Makefile Fri Aug 5 13:53:28 2016 (r303767) @@ -1015,7 +1015,6 @@ MLINKS+=lock.9 lockdestroy.9 \ lock.9 lockmgr_printinfo.9 \ lock.9 lockmgr_recursed.9 \ lock.9 lockmgr_rw.9 \ - lock.9 lockmgr_waiters.9 \ lock.9 lockstatus.9 MLINKS+=LOCK_PROFILING.9 MUTEX_PROFILING.9 MLINKS+=make_dev.9 destroy_dev.9 \ Modified: head/share/man/man9/lock.9 ============================================================================== --- head/share/man/man9/lock.9 Fri Aug 5 09:08:00 2016 (r303766) +++ head/share/man/man9/lock.9 Fri Aug 5 13:53:28 2016 (r303767) @@ -39,7 +39,6 @@ .Nm lockmgr_printinfo , .Nm lockmgr_recursed , .Nm lockmgr_rw , -.Nm lockmgr_waiters , .Nm lockstatus , .Nm lockmgr_assert .Nd "lockmgr family of functions" @@ -66,8 +65,6 @@ .Ft int .Fn lockmgr_rw "struct lock *lkp" "u_int flags" "struct rwlock *ilk" .Ft int -.Fn lockmgr_waiters "const struct lock *lkp" -.Ft int .Fn lockstatus "const struct lock *lkp" .Pp .Cd "options INVARIANTS" @@ -279,10 +276,6 @@ function returns true if the lock is rec otherwise. .Pp The -.Fn lockmgr_waiters -function returns true if the lock has waiters, 0 otherwise. -.Pp -The .Fn lockstatus function returns the status of the lock in relation to the current thread. .Pp Modified: head/sys/sys/buf.h ============================================================================== --- head/sys/sys/buf.h Fri Aug 5 09:08:00 2016 (r303766) +++ head/sys/sys/buf.h Fri Aug 5 13:53:28 2016 (r303767) @@ -355,12 +355,6 @@ extern const char *buf_wmesg; /* Defaul _lockmgr_disown(&(bp)->b_lock, LOCK_FILE, LOCK_LINE) #endif -/* - * Find out if the lock has waiters or not. - */ -#define BUF_LOCKWAITERS(bp) \ - lockmgr_waiters(&(bp)->b_lock) - #endif /* _KERNEL */ struct buf_queue_head { Modified: head/sys/sys/lockmgr.h ============================================================================== --- head/sys/sys/lockmgr.h Fri Aug 5 09:08:00 2016 (r303766) +++ head/sys/sys/lockmgr.h Fri Aug 5 13:53:28 2016 (r303767) @@ -127,8 +127,6 @@ _lockmgr_args_rw(struct lock *lk, u_int #define lockmgr_rw(lk, flags, ilk) \ _lockmgr_args_rw((lk), (flags), (ilk), LK_WMESG_DEFAULT, \ LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, LOCK_FILE, LOCK_LINE) -#define lockmgr_waiters(lk) \ - ((lk)->lk_lock & LK_ALL_WAITERS) #ifdef INVARIANTS #define lockmgr_assert(lk, what) \ _lockmgr_assert((lk), (what), LOCK_FILE, LOCK_LINE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608051353.u75DrSMA085253>