[src/netbsd-10]: src/usr.sbin/dumpfs Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/d9dbf915b537
branches:  netbsd-10
changeset: 372685:d9dbf915b537
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 20 09:49:21 2022 +0000

description:
Pull up following revision(s) (requested by chs in ticket #9):

        usr.sbin/dumpfs/dumpfs.c: revision 1.67
        usr.sbin/dumpfs/dumpfs.8: revision 1.21

dumpfs: remove confusing output for UFS2
remove the mention of "fslevel 5" because no such thing exists.

the whole "fs level" concept really only applies to UFS1, so don't print
the line with the level number and details for UFS2 file systems at all.
try to clarify this in the manpage as well.

prompted by PR 57082.

diffstat:

 usr.sbin/dumpfs/dumpfs.8 |   4 ++--
 usr.sbin/dumpfs/dumpfs.c |  15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r bf94814f5a0f -r d9dbf915b537 usr.sbin/dumpfs/dumpfs.8
--- a/usr.sbin/dumpfs/dumpfs.8  Mon Dec 19 14:00:35 2022 +0000
+++ b/usr.sbin/dumpfs/dumpfs.8  Tue Dec 20 09:49:21 2022 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: dumpfs.8,v 1.20 2010/02/27 10:49:42 wiz Exp $
+.\"    $NetBSD: dumpfs.8,v 1.20.56.1 2022/12/20 09:49:21 martin Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -80,7 +80,7 @@
 .Nm
 is useful mostly for finding out certain file system
 information such as the file system block size, minimum
-free space percentage, and the file system level that
+free space percentage, and (for FFSv1) the file system level that
 can be upgraded with the
 .Fl c
 option of
diff -r bf94814f5a0f -r d9dbf915b537 usr.sbin/dumpfs/dumpfs.c
--- a/usr.sbin/dumpfs/dumpfs.c  Mon Dec 19 14:00:35 2022 +0000
+++ b/usr.sbin/dumpfs/dumpfs.c  Tue Dec 20 09:49:21 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumpfs.c,v 1.66 2022/11/17 06:40:40 chs Exp $  */
+/*     $NetBSD: dumpfs.c,v 1.66.2.1 2022/12/20 09:49:21 martin Exp $   */
 
 /*
  * Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)dumpfs.c   8.5 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: dumpfs.c,v 1.66 2022/11/17 06:40:40 chs Exp $");
+__RCSID("$NetBSD: dumpfs.c,v 1.66.2.1 2022/12/20 09:49:21 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -314,7 +314,7 @@
            fs->fs_magic, ctime(&t));
 
        if (is_ufs2)
-               i = 5;
+               i = -1;
        else {
                i = 0;
                if (fs->fs_old_postblformat != FS_42POSTBLFMT) {
@@ -338,10 +338,11 @@
            fs->fs_id[0] || fs->fs_id[1])
                printf("superblock location\t%jd\tid\t[ %x %x ]\n",
                    (intmax_t)fs->fs_sblockloc, fs->fs_id[0], fs->fs_id[1]);
-       printf("cylgrp\t%s\tinodes\t%s\tsblock\t%s\tfslevel %d\n",
-           i < 1 ? "static" : "dynamic",
-           i < 2 ? "4.2/4.3BSD" : i < 5 ? "4.4BSD" : "FFSv2",
-           i < 4 ? "FFSv1" : "FFSv2", i);
+       if (!is_ufs2)
+               printf("cylgrp\t%s\tinodes\t%s\tsblock\t%s\tfslevel %d\n",
+                   i < 1 ? "static" : "dynamic",
+                   i < 2 ? "4.2/4.3BSD" : i < 5 ? "4.4BSD" : "FFSv2",
+                   i < 4 ? "FFSv1" : "FFSv2", i);
        printf("nbfree\t%lld\tndir\t%lld\tnifree\t%lld\tnffree\t%lld\n",
            (long long)fs->fs_cstotal.cs_nbfree,
            (long long)fs->fs_cstotal.cs_ndir,