[src/netbsd-1-5]: src/usr.sbin/dumplfs Pull up revision 1.17 (requested by pe...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/667d481e792c
branches:  netbsd-1-5
changeset: 490618:667d481e792c
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 03 21:40:03 2001 +0000

description:
Pull up revision 1.17 (requested by perseant):
  Let dumplfs report lfs_nclean and lfs_dmeta.

diffstat:

 usr.sbin/dumplfs/dumplfs.c |  33 +++++++++++++--------------------
 1 files changed, 13 insertions(+), 20 deletions(-)

diffs (76 lines):

diff -r 45e37e27602c -r 667d481e792c usr.sbin/dumplfs/dumplfs.c
--- a/usr.sbin/dumplfs/dumplfs.c        Sat Feb 03 21:19:26 2001 +0000
+++ b/usr.sbin/dumplfs/dumplfs.c        Sat Feb 03 21:40:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumplfs.c,v 1.14.2.1 2000/08/28 05:52:34 toshii Exp $  */
+/*     $NetBSD: dumplfs.c,v 1.14.2.2 2001/02/03 21:40:03 he Exp $      */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -45,7 +45,7 @@
 #if 0
 static char sccsid[] = "@(#)dumplfs.c  8.5 (Berkeley) 5/24/95";
 #else
-__RCSID("$NetBSD: dumplfs.c,v 1.14.2.1 2000/08/28 05:52:34 toshii Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.14.2.2 2001/02/03 21:40:03 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -606,6 +606,11 @@
                "cksum    ", lfsp->lfs_cksum,
                "maxfilesize  ", (long long)lfsp->lfs_maxfilesize);
 
+       (void)printf("%s%d\t%s%d\t%s%d\n",
+               "nclean   ", lfsp->lfs_nclean,
+               "dmeta    ", lfsp->lfs_dmeta,
+               "minfreeseg ", lfsp->lfs_minfreeseg);
+
        (void)printf("Superblock disk addresses:\t");
        for (i = 0; i < LFS_MAXNUMSB; i++) {
                (void)printf(" 0x%x", lfsp->lfs_sboffs[i]);
@@ -620,9 +625,9 @@
                "idaddr   ", lfsp->lfs_idaddr,
                "ifile    ", lfsp->lfs_ifile);
        (void)printf("%s%d\t%s%d\t%s%d\n",
+               "uinodes  ", lfsp->lfs_uinodes,
                "bfree    ", lfsp->lfs_bfree,
-               "avail    ", lfsp->lfs_avail,
-               "uinodes  ", lfsp->lfs_uinodes);
+               "avail    ", lfsp->lfs_avail);
        (void)printf("%s%d\t%s0x%x\t%s0x%x\n%s0x%x\t%s0x%x\t",
                "nfiles   ", lfsp->lfs_nfiles,
                "lastseg  ", lfsp->lfs_lastseg,
@@ -630,20 +635,6 @@
                "curseg   ", lfsp->lfs_curseg,
                "offset   ", lfsp->lfs_offset);
        (void)printf("tstamp   %s", ctime((time_t *)&lfsp->lfs_tstamp));
-#if 0  /* This is no longer stored on disk! --ks */
-       (void)printf("\nIn-Memory Information\n");
-       (void)printf("%s%d\t%s0x%x\t%s%d%s%d\t%s%d\n",
-               "seglock  ", lfsp->lfs_seglock,
-               "iocount  ", lfsp->lfs_iocount,
-               "writer   ", lfsp->lfs_writer,
-               "dirops   ", lfsp->lfs_dirops,
-               "doifile  ", lfsp->lfs_doifile);
-       (void)printf("%s%d\t%s%d\t%s0x%x\t%s%d\n",
-               "nactive  ", lfsp->lfs_nactive,
-               "fmod     ", lfsp->lfs_fmod,
-               "clean    ", lfsp->lfs_clean,
-               "ronly    ", lfsp->lfs_ronly);
-#endif
 }
 
 static void
@@ -667,8 +658,10 @@
        CLEANERINFO *cip;
 
        cip = (CLEANERINFO *)ipage;
-       (void)printf("segments clean\t%d\tsegments dirty\t%d\n\n",
-           cip->clean, cip->dirty);
+       (void)printf("clean\t%d\tdirty\t%d\n",
+                    cip->clean, cip->dirty);
+       (void)printf("bfree\t%d\tavail\t%d\n\n",
+                    cip->bfree, cip->avail);
 }
 
 static void