date and time created 83/02/18 00:41:40 by mckusick

[unix-history] / usr / src / sbin / dumpfs / dumpfs.c

diff --git a/usr/src/sbin/dumpfs/dumpfs.c b/usr/src/sbin/dumpfs/dumpfs.c
index ed27fd7..3b37504 100644 (file)
--- a/usr/src/sbin/dumpfs/dumpfs.c
+++ b/usr/src/sbin/dumpfs/dumpfs.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)dumpfs.c    2.1 (Berkeley) %G%";
+static char *sccsid = "@(#)dumpfs.c    2.4 (Berkeley) %G%";

 
 #ifndef SIMFS
 #include <sys/param.h>
 
 #ifndef SIMFS
 #include <sys/param.h>


@@ -29,7 +29,7 @@ union {
 main(argc, argv)
        char **argv;
 {
 main(argc, argv)
        char **argv;
 {

-       int c, i, j, k;
+       int c, i, j, k, size;

 
        close(0);
        if (open(argv[1], 0) != 0)
 
        close(0);
        if (open(argv[1], 0) != 0)


@@ -38,22 +38,30 @@ main(argc, argv)
        if (read(0, &afs, SBSIZE) != SBSIZE)
                perror(argv[1]), exit(1);
        printf("magic\t%x\ttime\t%s", afs.fs_magic, ctime(&afs.fs_time));
        if (read(0, &afs, SBSIZE) != SBSIZE)
                perror(argv[1]), exit(1);
        printf("magic\t%x\ttime\t%s", afs.fs_magic, ctime(&afs.fs_time));

-       printf("bblkno\t%d\tsblkno\t%d\n", afs.fs_bblkno, afs.fs_sblkno);
-       printf("cblkno\t%d\tiblkno\t%d\tdblkno\t%d\n",
-           afs.fs_cblkno, afs.fs_iblkno, afs.fs_dblkno);
-       printf("ncg\t%d\tsize\t%d\tblocks\t%d\tcgsize\t%d\n",
-           afs.fs_ncg, afs.fs_size, afs.fs_dsize, afs.fs_cgsize);
+       printf("sblkno\t%d\tcblkno\t%d\tiblkno\t%d\tdblkno\t%d\n",
+           afs.fs_sblkno, afs.fs_cblkno, afs.fs_iblkno, afs.fs_dblkno);
+       printf("sbsize\t%d\tcgsize\t%d\tcgoffset %d\tcgmask\t0x%08x\n",
+           afs.fs_sbsize, afs.fs_cgsize, afs.fs_cgoffset, afs.fs_cgmask);
+       printf("ncg\t%d\tsize\t%d\tblocks\t%d\n",
+           afs.fs_ncg, afs.fs_size, afs.fs_dsize);

        printf("bsize\t%d\tshift\t%d\tmask\t0x%08x\n",
            afs.fs_bsize, afs.fs_bshift, afs.fs_bmask);
        printf("fsize\t%d\tshift\t%d\tmask\t0x%08x\n",
            afs.fs_fsize, afs.fs_fshift, afs.fs_fmask);
        printf("bsize\t%d\tshift\t%d\tmask\t0x%08x\n",
            afs.fs_bsize, afs.fs_bshift, afs.fs_bmask);
        printf("fsize\t%d\tshift\t%d\tmask\t0x%08x\n",
            afs.fs_fsize, afs.fs_fshift, afs.fs_fmask);

-       printf("frag\t%d\tminfree\t%d%%\n", afs.fs_frag, afs.fs_minfree);
-       printf("rotdelay %dms\trps\t%d\n", afs.fs_rotdelay, afs.fs_rps);
-       printf("csaddr\t%d\tcssize\t%d\n", afs.fs_csaddr, afs.fs_cssize);
+       printf("frag\t%d\tshift\t%d\tfsbtodb\t%d\n",
+           afs.fs_frag, afs.fs_fragshift, afs.fs_fsbtodb);
+       printf("minfree\t%d%%\tmaxbpg\t%d\n",
+           afs.fs_minfree, afs.fs_maxbpg);
+       printf("maxcontig %d\trotdelay %dms\trps\t%d\n",
+           afs.fs_maxcontig, afs.fs_rotdelay, afs.fs_rps);
+       printf("csaddr\t%d\tcssize\t%d\tshift\t%d\tmask\t0x%08x\n",
+           afs.fs_csaddr, afs.fs_cssize, afs.fs_csshift, afs.fs_csmask);

        printf("ntrak\t%d\tnsect\t%d\tspc\t%d\tncyl\t%d\n",
            afs.fs_ntrak, afs.fs_nsect, afs.fs_spc, afs.fs_ncyl);
        printf("cpg\t%d\tbpg\t%d\tfpg\t%d\tipg\t%d\n",
            afs.fs_cpg, afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg);
        printf("ntrak\t%d\tnsect\t%d\tspc\t%d\tncyl\t%d\n",
            afs.fs_ntrak, afs.fs_nsect, afs.fs_spc, afs.fs_ncyl);
        printf("cpg\t%d\tbpg\t%d\tfpg\t%d\tipg\t%d\n",
            afs.fs_cpg, afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg);

+       printf("nindir\t%d\tinopb\t%d\tnspf\t%d\n",
+           afs.fs_nindir, afs.fs_inopb, afs.fs_nspf);

        printf("nbfree\t%d\tndir\t%d\tnifree\t%d\tnffree\t%d\n",
            afs.fs_cstotal.cs_nbfree, afs.fs_cstotal.cs_ndir,
            afs.fs_cstotal.cs_nifree, afs.fs_cstotal.cs_nffree);
        printf("nbfree\t%d\tndir\t%d\tnifree\t%d\tnffree\t%d\n",
            afs.fs_cstotal.cs_nbfree, afs.fs_cstotal.cs_ndir,
            afs.fs_cstotal.cs_nifree, afs.fs_cstotal.cs_nffree);


@@ -80,11 +88,13 @@ main(argc, argv)
                }
        }
        printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t");
                }
        }
        printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t");

-       for (i = 0; i < howmany(afs.fs_cssize, afs.fs_bsize); i++) {
-               afs.fs_csp[i] = (struct csum *)calloc(1, afs.fs_bsize);
-               lseek(0, fsbtodb(&afs, (afs.fs_csaddr + (i * afs.fs_frag))) *
+       for (i = 0, j = 0; i < afs.fs_cssize; i += afs.fs_bsize, j++) {
+               size = afs.fs_cssize - i < afs.fs_bsize ?
+                   afs.fs_cssize - i : afs.fs_bsize;
+               afs.fs_csp[j] = (struct csum *)calloc(1, size);
+               lseek(0, fsbtodb(&afs, (afs.fs_csaddr + j * afs.fs_frag)) *

                    DEV_BSIZE, 0);
                    DEV_BSIZE, 0);

-               if (read(0, afs.fs_csp[i], afs.fs_bsize) != afs.fs_bsize)
+               if (read(0, afs.fs_csp[j], size) != size)

                        perror(argv[1]), exit(1);
        }
        for (i = 0; i < afs.fs_ncg; i++) {
                        perror(argv[1]), exit(1);
        }
        for (i = 0; i < afs.fs_ncg; i++) {