git: 2389370c75c1 - stable/15 - lockmgr(9): add lockcanrecurse(9)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Aug 2026 00:35:51 UTC
The branch stable/15 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=2389370c75c132147fbfa99289a2cbc10a8a43ea
commit 2389370c75c132147fbfa99289a2cbc10a8a43ea
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-07-31 04:11:05 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-08-13 00:34:41 +0000
lockmgr(9): add lockcanrecurse(9)
(cherry picked from commit 1d97ad676d586aa5d91227ebaa39bd9c3b1d68fe)
---
sys/kern/kern_lock.c | 7 +++++++
sys/sys/lockmgr.h | 1 +
sys/sys/vnode.h | 2 ++
3 files changed, 10 insertions(+)
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 76f68677e292..b12d5bc2f12c 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -495,6 +495,13 @@ lockdisablerecurse(struct lock *lk)
lk->lock_object.lo_flags &= ~LO_RECURSABLE;
}
+bool
+lockcanrecurse(struct lock *lk)
+{
+ lockmgr_assert(lk, KA_LOCKED);
+ return ((lk->lock_object.lo_flags & LO_RECURSABLE) != 0);
+}
+
void
lockdestroy(struct lock *lk)
{
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index 48eea47c60da..ca066148d7d3 100644
--- a/sys/sys/lockmgr.h
+++ b/sys/sys/lockmgr.h
@@ -82,6 +82,7 @@ void _lockmgr_disown(struct lock *lk, const char *file, int line);
void lockallowrecurse(struct lock *lk);
void lockallowshare(struct lock *lk);
+bool lockcanrecurse(struct lock *lk);
void lockdestroy(struct lock *lk);
void lockdisablerecurse(struct lock *lk);
void lockdisableshare(struct lock *lk);
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 4513a7a62140..dfa0debc5c39 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -484,6 +484,8 @@ extern u_int vn_lock_pair_pause_max;
#define VI_MTX(vp) (&(vp)->v_interlock)
#define VN_LOCK_AREC(vp) lockallowrecurse((vp)->v_vnlock)
+#define VN_LOCK_DREC(vp) lockdisablerecurse((vp)->v_vnlock)
+#define VN_LOCK_CANREC(vp) lockcanrecurse((vp)->v_vnlock)
#define VN_LOCK_ASHARE(vp) lockallowshare((vp)->v_vnlock)
#define VN_LOCK_DSHARE(vp) lockdisableshare((vp)->v_vnlock)