diff options
-rw-r--r-- | usr.sbin/pstat/pstat.8 | 18 | ||||
-rw-r--r-- | usr.sbin/pstat/pstat.c | 19 |
2 files changed, 22 insertions, 15 deletions
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8 index 52dc5ae5f4c..394fef5651b 100644 --- a/usr.sbin/pstat/pstat.8 +++ b/usr.sbin/pstat/pstat.8 @@ -1,3 +1,5 @@ +.\" $OpenBSD: pstat.8,v 1.4 1996/05/05 16:15:46 deraadt Exp $ +.\" $NetBSD: pstat.8,v 1.9 1996/05/02 00:13:08 cgd Exp $ .\" Copyright (c) 1980, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. .\" @@ -30,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)pstat.8 8.4 (Berkeley) 4/19/94 -.\" $Id: pstat.8,v 1.3 1996/01/11 17:54:00 deraadt Exp $ +.\" $Id: pstat.8,v 1.4 1996/05/05 16:15:46 deraadt Exp $ .\" .Dd April 19, 1994 .Dt PSTAT 8 @@ -217,20 +219,18 @@ A list of letters representing vnode flags: \- VROOT .It T \- VTEXT +.It S +\- VSYSTEM +.It I +\- VISTTY .It L \- VXLOCK .It W \- VXWANT -.It E -\- VEXLOCK -.It S -\- VSHLOCK -.It T -\- VLWAIT -.It A -\- VALIASED .It B \- VBWAIT +.It A +\- VALIASED .El .Pp .It USE diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index e41f8a32a3f..f502bb7e959 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pstat.c,v 1.3 1996/03/25 15:56:06 niklas Exp $ */ -/* $NetBSD: pstat.c,v 1.17 1996/02/21 02:27:57 cgd Exp $ */ +/* $OpenBSD: pstat.c,v 1.4 1996/05/05 16:15:48 deraadt Exp $ */ +/* $NetBSD: pstat.c,v 1.19 1996/05/02 00:13:19 cgd Exp $ */ /*- * Copyright (c) 1980, 1991, 1993 @@ -43,9 +43,9 @@ static char copyright[] = #ifndef lint #if 0 from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; -from: static char *rcsid = "$NetBSD: pstat.c,v 1.17 1996/02/21 02:27:57 cgd Exp $"; +from: static char *rcsid = "$NetBSD: pstat.c,v 1.19 1996/05/02 00:13:19 cgd Exp $"; #else -static char *rcsid = "$OpenBSD: pstat.c,v 1.3 1996/03/25 15:56:06 niklas Exp $"; +static char *rcsid = "$OpenBSD: pstat.c,v 1.4 1996/05/05 16:15:48 deraadt Exp $"; #endif #endif /* not lint */ @@ -408,6 +408,8 @@ vnode_print(avnode, vp) *fp++ = 'T'; if (flag & VSYSTEM) *fp++ = 'S'; + if (flag & VISTTY) + *fp++ = 'I'; if (flag & VXLOCK) *fp++ = 'L'; if (flag & VXWANT) @@ -616,6 +618,11 @@ mount_print(mp) flags &= ~MNT_QUOTA; comma = ","; } + if (flags & MNT_ROOTFS) { + (void)printf("%srootfs", comma); + flags &= ~MNT_ROOTFS; + comma = ","; + } /* filesystem control flags */ if (flags & MNT_UPDATE) { (void)printf("%supdate", comma); @@ -706,10 +713,10 @@ kinfo_vnodes(avnodes) bp = vbuf; evbuf = vbuf + (numvnodes + 20) * (VPTRSZ + VNODESZ); KGET(V_MOUNTLIST, mountlist); - for (num = 0, mp = mountlist.cqh_first; ; mp = mp->mnt_list.cqe_next) { + for (num = 0, mp = mountlist.cqh_first; ; mp = mount.mnt_list.cqe_next) { KGET2(mp, &mount, sizeof(mount), "mount entry"); for (vp = mount.mnt_vnodelist.lh_first; - vp != NULL; vp = vp->v_mntvnodes.le_next) { + vp != NULL; vp = vnode.v_mntvnodes.le_next) { KGET2(vp, &vnode, sizeof(vnode), "vnode"); if ((bp + VPTRSZ + VNODESZ) > evbuf) /* XXX - should realloc */ |