diff options
| -rw-r--r-- | usr.sbin/pstat/pstat.8 | 46 | ||||
| -rw-r--r-- | usr.sbin/pstat/pstat.c | 57 |
2 files changed, 74 insertions, 29 deletions
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8 index a39eb3063e9..c8758c3fbd8 100644 --- a/usr.sbin/pstat/pstat.8 +++ b/usr.sbin/pstat/pstat.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pstat.8,v 1.14 2000/03/19 17:57:12 aaron Exp $ +.\" $OpenBSD: pstat.8,v 1.15 2000/06/16 19:03:48 assar Exp $ .\" $NetBSD: pstat.8,v 1.9.4.1 1996/06/02 09:08:17 mrg Exp $ .\" .\" Copyright (c) 1980, 1991, 1993, 1994 @@ -246,18 +246,26 @@ A list of letters representing vnode flags: VROOT root of its file system. .It T VTEXT pure text prototype. +.It S +VSYSTEM vnode being used by kernel. +.It I +VISTTY vnode represents a tty .It L VXLOCK locked to change underlying type. .It W VXWANT process is waiting for vnode. -.It S -VSYSTEM vnode being used by kernel. -.It A -VALIASED vnode has an alias .It B VBWAIT waiting for output to complete +.It A +VALIASED vnode has an alias .It D VDIROP lfs vnode involved in directory op. +.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 .Pp .It USE @@ -274,28 +282,22 @@ Miscellaneous filesystem specific state variables encoded thus: .Bl -tag -width indent .It "For ffs:" .Bl -tag -width indent -compact -.It L -locked -.It U -update time -.Pq Xr fs 5 -must be corrected .It A access time must be corrected -.It W -wanted by another process (L flag is on) .It C changed time must be corrected +.It U +update time +.Pq Xr fs 5 +must be corrected +.It R +has a rename in progress +.It M +contains modifications .It S shared lock applied .It E exclusive lock applied -.It Z -someone waiting for a lock -.It M -contains modifications -.It R -has a rename in progress .El .It "For nfs:" .Bl -tag -width indent -compact @@ -313,6 +315,12 @@ non-cacheable lease (nqnfs) write lease (nqnfs) .It G lease was evicted (nqnfs) +.It A +special file accessed +.It U +special file updated +.It C +special file times changed .El .It SIZ/RDEV Number of bytes in an ordinary file, or diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index e2da38f0c67..df76c6a42c1 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.23 2000/05/24 03:24:23 deraadt Exp $ */ +/* $OpenBSD: pstat.c,v 1.24 2000/06/16 19:03:48 assar Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; #else -static char *rcsid = "$OpenBSD: pstat.c,v 1.23 2000/05/24 03:24:23 deraadt Exp $"; +static char *rcsid = "$OpenBSD: pstat.c,v 1.24 2000/06/16 19:03:48 assar Exp $"; #endif #endif /* not lint */ @@ -346,6 +346,12 @@ vnode_print(avnode, vp) *fp++ = 'A'; if (flag & VDIROP) *fp++ = 'D'; + if (flag & VONFREELIST) + *fp++ = 'F'; + if (flag & VLOCKSWORK) + *fp++ = 'l'; + if (flag & VONSYNCLIST) + *fp++ = 's'; if (flag == 0) *fp++ = '-'; *fp = '\0'; @@ -379,16 +385,16 @@ ufs_print(vp) if (flag & IN_LWAIT) *flags++ = 'Z'; #endif - if (flag & IN_RENAME) - *flags++ = 'R'; - if (flag & IN_UPDATE) - *flags++ = 'U'; if (flag & IN_ACCESS) *flags++ = 'A'; if (flag & IN_CHANGE) *flags++ = 'C'; + if (flag & IN_UPDATE) + *flags++ = 'U'; if (flag & IN_MODIFIED) *flags++ = 'M'; + if (flag & IN_RENAME) + *flags++ = 'R'; if (flag & IN_SHLOCK) *flags++ = 'S'; if (flag & IN_EXLOCK) @@ -435,16 +441,16 @@ ext2fs_print(vp) if (flag & IN_LWAIT) *flags++ = 'Z'; #endif - if (flag & IN_RENAME) - *flags++ = 'R'; - if (flag & IN_UPDATE) - *flags++ = 'U'; if (flag & IN_ACCESS) *flags++ = 'A'; if (flag & IN_CHANGE) *flags++ = 'C'; + if (flag & IN_UPDATE) + *flags++ = 'U'; if (flag & IN_MODIFIED) *flags++ = 'M'; + if (flag & IN_RENAME) + *flags++ = 'R'; if (flag & IN_SHLOCK) *flags++ = 'S'; if (flag & IN_EXLOCK) @@ -489,6 +495,12 @@ nfs_print(vp) *flags++ = 'O'; if (flag & NQNFSEVICTED) *flags++ = 'G'; + if (flag & NACC) + *flags++ = 'A'; + if (flag & NUPD) + *flags++ = 'U'; + if (flag & NCHG) + *flags++ = 'C'; if (flag == 0) *flags++ = '-'; *flags = '\0'; @@ -624,12 +636,32 @@ mount_print(mp) flags &= ~MNT_ROOTFS; comma = ","; } + if (flags & MNT_NOATIME) { + (void)printf("%snoatime", comma); + flags &= ~MNT_NOATIME; + comma = ","; + } /* filesystem control flags */ if (flags & MNT_UPDATE) { (void)printf("%supdate", comma); flags &= ~MNT_UPDATE; comma = ","; } + if (flags & MNT_DELEXPORT) { + (void)printf("%sdelexport", comma); + flags &= ~MNT_DELEXPORT; + comma = ","; + } + if (flags & MNT_RELOAD) { + (void)printf("%sreload", comma); + flags &= ~MNT_RELOAD; + comma = ","; + } + if (flags & MNT_FORCE) { + (void)printf("%sforce", comma); + flags &= ~MNT_FORCE; + comma = ","; + } if (flags & MNT_MLOCK) { (void)printf("%slock", comma); flags &= ~MNT_MLOCK; @@ -655,6 +687,11 @@ mount_print(mp) flags &= ~MNT_UNMOUNT; comma = ","; } + if (flags & MNT_WANTRDWR) { + (void)printf("%swantrdwr", comma); + flags &= ~MNT_WANTRDWR; + comma = ","; + } if (flags & MNT_SOFTDEP) { (void)printf("%ssoftdep", comma); flags &= ~MNT_SOFTDEP; |