From 0cb073b8d9693f28eeba04268702079e073c666c Mon Sep 17 00:00:00 2001 From: semarie Date: Tue, 19 Oct 2021 14:50:05 +0000 Subject: [PATCH] vnode: remove VLOCKSWORK usage in pstat and mention in man pages unbreak the tree. found hard way by tb@ ok tb@ which have the same diff --- share/man/man9/vnode.9 | 6 ++---- usr.sbin/pstat/pstat.8 | 6 ++---- usr.sbin/pstat/pstat.c | 4 +--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9 index 0b545ac1839..80affa5459f 100644 --- a/share/man/man9/vnode.9 +++ b/share/man/man9/vnode.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: vnode.9,v 1.33 2020/01/20 23:23:04 claudio Exp $ +.\" $OpenBSD: vnode.9,v 1.34 2021/10/19 14:50:05 semarie Exp $ .\" .\" Copyright (c) 2001 Constantine Sapuntzakis .\" All rights reserved. @@ -23,7 +23,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: January 20 2020 $ +.Dd $Mdocdate: October 19 2021 $ .Dt VNODE 9 .Os .Sh NAME @@ -303,8 +303,6 @@ This vnode is locked to change its underlying type. A process is waiting for this vnode. .It Dv VALIASED This vnode has an alias. -.It Dv VLOCKSWORK -This vnode's underlying file system supports locking discipline. .El .Pp The diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8 index 80a85a33104..8f92bae3870 100644 --- a/usr.sbin/pstat/pstat.8 +++ b/usr.sbin/pstat/pstat.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pstat.8,v 1.58 2020/04/23 21:28:10 jmc Exp $ +.\" $OpenBSD: pstat.8,v 1.59 2021/10/19 14:50:05 semarie Exp $ .\" $NetBSD: pstat.8,v 1.9.4.1 1996/06/02 09:08:17 mrg Exp $ .\" .\" Copyright (c) 1980, 1991, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" from: @(#)pstat.8 8.4 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: April 23 2020 $ +.Dd $Mdocdate: October 19 2021 $ .Dt PSTAT 8 .Os .Sh NAME @@ -271,8 +271,6 @@ VBWAIT waiting for output to complete. VALIASED vnode has an alias. .It F VONFREELIST vnode is on a free list. -.It l -VLOCKSWORK FS supports locking discipline. .It s VONSYNCLIST vnode is on syncer worklist. .El diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index 3918afba16d..af732d407a5 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.124 2021/07/12 15:09:21 beck Exp $ */ +/* $OpenBSD: pstat.c,v 1.125 2021/10/19 14:50:05 semarie Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -499,8 +499,6 @@ vnode_print(struct vnode *avnode, struct vnode *vp) *fp++ = 'A'; if (vp->v_bioflag & VBIOONFREELIST) *fp++ = 'F'; - if (flag & VLOCKSWORK) - *fp++ = 'l'; if (vp->v_bioflag & VBIOONSYNCLIST) *fp++ = 's'; if (fp == flags) -- 2.20.1