BSD 4_4_Lite1 release

[unix-history] / usr / src / sbin / newfs / mkfs.c

diff --git a/usr/src/sbin/newfs/mkfs.c b/usr/src/sbin/newfs/mkfs.c
index cbc336f..80cb734 100644 (file)
--- a/usr/src/sbin/newfs/mkfs.c
+++ b/usr/src/sbin/newfs/mkfs.c
@@ -1,27 +1,67 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)mkfs.c     6.5 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)mkfs.c     8.3 (Berkeley) 2/3/94";
+#endif /* not lint */

 
 

-/*
- * make file system for cylinder-group style file systems
- */
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <sys/resource.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
+#include <sys/disklabel.h>

 
 #ifndef STANDALONE
 
 #ifndef STANDALONE

-#include <stdio.h>

 #include <a.out.h>
 #include <a.out.h>

+#include <stdio.h>

 #endif
 
 #endif
 

-#include <sys/param.h>
-#include <sys/inode.h>
-#include <sys/fs.h>
-#include <sys/dir.h>
-#include <sys/disklabel.h>
+/*
+ * make file system for cylinder-group style file systems
+ */
+
+/*
+ * We limit the size of the inode map to be no more than a
+ * third of the cylinder group space, since we must leave at
+ * least an equal amount of space for the block map.
+ *
+ * N.B.: MAXIPG must be a multiple of INOPB(fs).
+ */
+#define MAXIPG(fs)     roundup((fs)->fs_bsize * NBBY / 3, INOPB(fs))

 
 #define UMASK          0755
 #define MAXINOPB       (MAXBSIZE / sizeof(struct dinode))
 
 #define UMASK          0755
 #define MAXINOPB       (MAXBSIZE / sizeof(struct dinode))


@@ -30,7 +70,9 @@ static char sccsid[] = "@(#)mkfs.c    6.5 (Berkeley) %G%";
 /*
  * variables set up by front end.
  */
 /*
  * variables set up by front end.
  */

+extern int     mfs;            /* run as the memory based filesystem */

 extern int     Nflag;          /* run mkfs without writing file system */
 extern int     Nflag;          /* run mkfs without writing file system */

+extern int     Oflag;          /* format as an 4.3BSD file system */

 extern int     fssize;         /* file system size */
 extern int     ntracks;        /* # tracks/cylinder */
 extern int     nsectors;       /* # sectors/track */
 extern int     fssize;         /* file system size */
 extern int     ntracks;        /* # tracks/cylinder */
 extern int     nsectors;       /* # sectors/track */


@@ -52,12 +94,16 @@ extern int  density;        /* number of bytes per inode */
 extern int     maxcontig;      /* max contiguous blocks to allocate */
 extern int     rotdelay;       /* rotational delay between blocks */
 extern int     maxbpg;         /* maximum blocks per file in a cyl group */
 extern int     maxcontig;      /* max contiguous blocks to allocate */
 extern int     rotdelay;       /* rotational delay between blocks */
 extern int     maxbpg;         /* maximum blocks per file in a cyl group */

+extern int     nrpos;          /* # of distinguished rotational positions */

 extern int     bbsize;         /* boot block size */
 extern int     sbsize;         /* superblock size */
 extern int     bbsize;         /* boot block size */
 extern int     sbsize;         /* superblock size */

+extern u_long  memleft;        /* virtual memory available */
+extern caddr_t membase;        /* start address of memory based filesystem */
+extern caddr_t malloc(), calloc();

 
 union {
        struct fs fs;
 
 union {
        struct fs fs;

-       char pad[MAXBSIZE];
+       char pad[SBSIZE];

 } fsun;
 #define        sblock  fsun.fs
 struct csum *fscs;
 } fsun;
 #define        sblock  fsun.fs
 struct csum *fscs;


@@ -68,10 +114,9 @@ union {
 } cgun;
 #define        acg     cgun.cg
 
 } cgun;
 #define        acg     cgun.cg
 

-struct dinode zino[MAXIPG];
+struct dinode zino[MAXBSIZE / sizeof(struct dinode)];

 
 int    fsi, fso;
 
 int    fsi, fso;

-time_t utime;

 daddr_t        alloc();
 
 mkfs(pp, fsys, fi, fo)
 daddr_t        alloc();
 
 mkfs(pp, fsys, fi, fo)


@@ -83,18 +128,49 @@ mkfs(pp, fsys, fi, fo)
        long cylno, rpos, blk, j, warn = 0;
        long used, mincpgcnt, bpcg;
        long mapcramped, inodecramped;
        long cylno, rpos, blk, j, warn = 0;
        long used, mincpgcnt, bpcg;
        long mapcramped, inodecramped;

+       long postblsize, rotblsize, totalsbsize;
+       int ppid, status;
+       time_t utime;
+       quad_t sizepb;
+       void started();

 
 #ifndef STANDALONE
        time(&utime);
 #endif
 
 #ifndef STANDALONE
        time(&utime);
 #endif

+       if (mfs) {
+               ppid = getpid();
+               (void) signal(SIGUSR1, started);
+               if (i = fork()) {
+                       if (i == -1) {
+                               perror("mfs");
+                               exit(10);
+                       }
+                       if (waitpid(i, &status, 0) != -1 && WIFEXITED(status))
+                               exit(WEXITSTATUS(status));
+                       exit(11);
+                       /* NOTREACHED */
+               }
+               (void)malloc(0);
+               if (fssize * sectorsize > memleft)
+                       fssize = (memleft - 16384) / sectorsize;
+               if ((membase = malloc(fssize * sectorsize)) == 0)
+                       exit(12);
+       }

        fsi = fi;
        fso = fo;
        fsi = fi;
        fso = fo;

+       if (Oflag) {
+               sblock.fs_inodefmt = FS_42INODEFMT;
+               sblock.fs_maxsymlinklen = 0;
+       } else {
+               sblock.fs_inodefmt = FS_44INODEFMT;
+               sblock.fs_maxsymlinklen = MAXSYMLINKLEN;
+       }

        /*
         * Validate the given file system size.
         * Verify that its last block can actually be accessed.
         */
        if (fssize <= 0)
        /*
         * Validate the given file system size.
         * Verify that its last block can actually be accessed.
         */
        if (fssize <= 0)

-               printf("preposterous size %d\n", fssize), exit(1);
+               printf("preposterous size %d\n", fssize), exit(13);

        wtfs(fssize - 1, sectorsize, (char *)&sblock);
        /*
         * collect and verify the sector and track info
        wtfs(fssize - 1, sectorsize, (char *)&sblock);
        /*
         * collect and verify the sector and track info


@@ -102,9 +178,9 @@ mkfs(pp, fsys, fi, fo)
        sblock.fs_nsect = nsectors;
        sblock.fs_ntrak = ntracks;
        if (sblock.fs_ntrak <= 0)
        sblock.fs_nsect = nsectors;
        sblock.fs_ntrak = ntracks;
        if (sblock.fs_ntrak <= 0)

-               printf("preposterous ntrak %d\n", sblock.fs_ntrak), exit(1);
+               printf("preposterous ntrak %d\n", sblock.fs_ntrak), exit(14);

        if (sblock.fs_nsect <= 0)
        if (sblock.fs_nsect <= 0)

-               printf("preposterous nsect %d\n", sblock.fs_nsect), exit(1);
+               printf("preposterous nsect %d\n", sblock.fs_nsect), exit(15);

        /*
         * collect and verify the block and fragment sizes
         */
        /*
         * collect and verify the block and fragment sizes
         */


@@ -113,30 +189,32 @@ mkfs(pp, fsys, fi, fo)
        if (!POWEROF2(sblock.fs_bsize)) {
                printf("block size must be a power of 2, not %d\n",
                    sblock.fs_bsize);
        if (!POWEROF2(sblock.fs_bsize)) {
                printf("block size must be a power of 2, not %d\n",
                    sblock.fs_bsize);

-               exit(1);
+               exit(16);

        }
        if (!POWEROF2(sblock.fs_fsize)) {
                printf("fragment size must be a power of 2, not %d\n",
                    sblock.fs_fsize);
        }
        if (!POWEROF2(sblock.fs_fsize)) {
                printf("fragment size must be a power of 2, not %d\n",
                    sblock.fs_fsize);

-               exit(1);
+               exit(17);

        }
        if (sblock.fs_fsize < sectorsize) {
                printf("fragment size %d is too small, minimum is %d\n",
                    sblock.fs_fsize, sectorsize);
        }
        if (sblock.fs_fsize < sectorsize) {
                printf("fragment size %d is too small, minimum is %d\n",
                    sblock.fs_fsize, sectorsize);

-               exit(1);
+               exit(18);

        }
        if (sblock.fs_bsize < MINBSIZE) {
                printf("block size %d is too small, minimum is %d\n",
                    sblock.fs_bsize, MINBSIZE);
        }
        if (sblock.fs_bsize < MINBSIZE) {
                printf("block size %d is too small, minimum is %d\n",
                    sblock.fs_bsize, MINBSIZE);

-               exit(1);
+               exit(19);

        }
        if (sblock.fs_bsize < sblock.fs_fsize) {
                printf("block size (%d) cannot be smaller than fragment size (%d)\n",
                    sblock.fs_bsize, sblock.fs_fsize);
        }
        if (sblock.fs_bsize < sblock.fs_fsize) {
                printf("block size (%d) cannot be smaller than fragment size (%d)\n",
                    sblock.fs_bsize, sblock.fs_fsize);

-               exit(1);
+               exit(20);

        }
        sblock.fs_bmask = ~(sblock.fs_bsize - 1);
        sblock.fs_fmask = ~(sblock.fs_fsize - 1);
        }
        sblock.fs_bmask = ~(sblock.fs_bsize - 1);
        sblock.fs_fmask = ~(sblock.fs_fsize - 1);

+       sblock.fs_qbmask = ~sblock.fs_bmask;
+       sblock.fs_qfmask = ~sblock.fs_fmask;

        for (sblock.fs_bshift = 0, i = sblock.fs_bsize; i > 1; i >>= 1)
                sblock.fs_bshift++;
        for (sblock.fs_fshift = 0, i = sblock.fs_fsize; i > 1; i >>= 1)
        for (sblock.fs_bshift = 0, i = sblock.fs_bsize; i > 1; i >>= 1)
                sblock.fs_bshift++;
        for (sblock.fs_fshift = 0, i = sblock.fs_fsize; i > 1; i >>= 1)


@@ -148,8 +226,9 @@ mkfs(pp, fsys, fi, fo)
                printf("fragment size %d is too small, minimum with block size %d is %d\n",
                    sblock.fs_fsize, sblock.fs_bsize,
                    sblock.fs_bsize / MAXFRAG);
                printf("fragment size %d is too small, minimum with block size %d is %d\n",
                    sblock.fs_fsize, sblock.fs_bsize,
                    sblock.fs_bsize / MAXFRAG);

-               exit(1);
+               exit(21);

        }
        }

+       sblock.fs_nrpos = nrpos;

        sblock.fs_nindir = sblock.fs_bsize / sizeof(daddr_t);
        sblock.fs_inopb = sblock.fs_bsize / sizeof(struct dinode);
        sblock.fs_nspf = sblock.fs_fsize / sectorsize;
        sblock.fs_nindir = sblock.fs_bsize / sizeof(daddr_t);
        sblock.fs_inopb = sblock.fs_bsize / sizeof(struct dinode);
        sblock.fs_nspf = sblock.fs_fsize / sectorsize;


@@ -166,6 +245,11 @@ mkfs(pp, fsys, fi, fo)
                sblock.fs_cgmask <<= 1;
        if (!POWEROF2(sblock.fs_ntrak))
                sblock.fs_cgmask <<= 1;
                sblock.fs_cgmask <<= 1;
        if (!POWEROF2(sblock.fs_ntrak))
                sblock.fs_cgmask <<= 1;

+       sblock.fs_maxfilesize = sblock.fs_bsize * NDADDR - 1;
+       for (sizepb = sblock.fs_bsize, i = 0; i < NIADDR; i++) {
+               sizepb *= NINDIR(&sblock);
+               sblock.fs_maxfilesize += sizepb;
+       }

        /*
         * Validate specified/determined secpercyl
         * and calculate minimum cylinders per group.
        /*
         * Validate specified/determined secpercyl
         * and calculate minimum cylinders per group.


@@ -176,25 +260,24 @@ mkfs(pp, fsys, fi, fo)
             sblock.fs_cpc >>= 1, i >>= 1)
                /* void */;
        mincpc = sblock.fs_cpc;
             sblock.fs_cpc >>= 1, i >>= 1)
                /* void */;
        mincpc = sblock.fs_cpc;

-       if (mincpc > MAXCPG) {
-               printf("Maximum frag size with %d sectors per cylinder is %d\n",
-                   sblock.fs_spc, sblock.fs_fsize / (mincpc / MAXCPG));
-               exit(1);
-       }

        bpcg = sblock.fs_spc * sectorsize;
        inospercg = roundup(bpcg / sizeof(struct dinode), INOPB(&sblock));
        bpcg = sblock.fs_spc * sectorsize;
        inospercg = roundup(bpcg / sizeof(struct dinode), INOPB(&sblock));

-       if (inospercg > MAXIPG)
-               inospercg = MAXIPG;
+       if (inospercg > MAXIPG(&sblock))
+               inospercg = MAXIPG(&sblock);

        used = (sblock.fs_iblkno + inospercg / INOPF(&sblock)) * NSPF(&sblock);
        mincpgcnt = howmany(sblock.fs_cgoffset * (~sblock.fs_cgmask) + used,
            sblock.fs_spc);
        mincpg = roundup(mincpgcnt, mincpc);
        /*
        used = (sblock.fs_iblkno + inospercg / INOPF(&sblock)) * NSPF(&sblock);
        mincpgcnt = howmany(sblock.fs_cgoffset * (~sblock.fs_cgmask) + used,
            sblock.fs_spc);
        mincpg = roundup(mincpgcnt, mincpc);
        /*

-        * Insure that cylinder group with mincpg has enough space
-        * for block maps
+        * Ensure that cylinder group with mincpg has enough space
+        * for block maps.

         */
         */

+       sblock.fs_cpg = mincpg;
+       sblock.fs_ipg = inospercg;
+       if (maxcontig > 1)
+               sblock.fs_contigsumsize = MIN(maxcontig, FS_MAXCONTIG);

        mapcramped = 0;
        mapcramped = 0;

-       while (mincpg * sblock.fs_spc > MAXBPG(&sblock) * NSPB(&sblock)) {
+       while (CGSIZE(&sblock) > sblock.fs_bsize) {

                mapcramped = 1;
                if (sblock.fs_bsize < MAXBSIZE) {
                        sblock.fs_bsize <<= 1;
                mapcramped = 1;
                if (sblock.fs_bsize < MAXBSIZE) {
                        sblock.fs_bsize <<= 1;


@@ -204,6 +287,7 @@ mkfs(pp, fsys, fi, fo)
                                sblock.fs_cpc <<= 1;
                                mincpc <<= 1;
                                mincpg = roundup(mincpgcnt, mincpc);
                                sblock.fs_cpc <<= 1;
                                mincpc <<= 1;
                                mincpg = roundup(mincpgcnt, mincpc);

+                               sblock.fs_cpg = mincpg;

                        }
                        sblock.fs_frag <<= 1;
                        sblock.fs_fragshift += 1;
                        }
                        sblock.fs_frag <<= 1;
                        sblock.fs_fragshift += 1;


@@ -213,7 +297,7 @@ mkfs(pp, fsys, fi, fo)
                if (sblock.fs_fsize == sblock.fs_bsize) {
                        printf("There is no block size that");
                        printf(" can support this disk\n");
                if (sblock.fs_fsize == sblock.fs_bsize) {
                        printf("There is no block size that");
                        printf(" can support this disk\n");

-                       exit(1);
+                       exit(22);

                }
                sblock.fs_frag >>= 1;
                sblock.fs_fragshift -= 1;
                }
                sblock.fs_frag >>= 1;
                sblock.fs_fragshift -= 1;


@@ -221,35 +305,38 @@ mkfs(pp, fsys, fi, fo)
                sblock.fs_nspf <<= 1;
        }
        /*
                sblock.fs_nspf <<= 1;
        }
        /*

-        * Insure that cylinder group with mincpg has enough space for inodes
+        * Ensure that cylinder group with mincpg has enough space for inodes.

         */
        inodecramped = 0;
        used *= sectorsize;
         */
        inodecramped = 0;
        used *= sectorsize;

-       inospercg = (mincpg * bpcg - used) / density;
-       while (inospercg > MAXIPG) {
+       inospercg = roundup((mincpg * bpcg - used) / density, INOPB(&sblock));
+       sblock.fs_ipg = inospercg;
+       while (inospercg > MAXIPG(&sblock)) {

                inodecramped = 1;
                if (mincpc == 1 || sblock.fs_frag == 1 ||
                    sblock.fs_bsize == MINBSIZE)
                        break;
                printf("With a block size of %d %s %d\n", sblock.fs_bsize,
                    "minimum bytes per inode is",
                inodecramped = 1;
                if (mincpc == 1 || sblock.fs_frag == 1 ||
                    sblock.fs_bsize == MINBSIZE)
                        break;
                printf("With a block size of %d %s %d\n", sblock.fs_bsize,
                    "minimum bytes per inode is",

-                   (mincpg * bpcg - used) / MAXIPG + 1);
+                   (mincpg * bpcg - used) / MAXIPG(&sblock) + 1);

                sblock.fs_bsize >>= 1;
                sblock.fs_frag >>= 1;
                sblock.fs_fragshift -= 1;
                mincpc >>= 1;
                sblock.fs_bsize >>= 1;
                sblock.fs_frag >>= 1;
                sblock.fs_fragshift -= 1;
                mincpc >>= 1;

-               i = roundup(mincpgcnt, mincpc);
-               if (i * sblock.fs_spc > MAXBPG(&sblock) * NSPB(&sblock)) {
+               sblock.fs_cpg = roundup(mincpgcnt, mincpc);
+               if (CGSIZE(&sblock) > sblock.fs_bsize) {

                        sblock.fs_bsize <<= 1;
                        break;
                }
                        sblock.fs_bsize <<= 1;
                        break;
                }

-               mincpg = i;
-               inospercg = (mincpg * bpcg - used) / density;
+               mincpg = sblock.fs_cpg;
+               inospercg =
+                   roundup((mincpg * bpcg - used) / density, INOPB(&sblock));
+               sblock.fs_ipg = inospercg;

        }
        if (inodecramped) {
        }
        if (inodecramped) {

-               if (inospercg > MAXIPG) {
+               if (inospercg > MAXIPG(&sblock)) {

                        printf("Minimum bytes per inode is %d\n",
                        printf("Minimum bytes per inode is %d\n",

-                           (mincpg * bpcg - used) / MAXIPG + 1);
+                           (mincpg * bpcg - used) / MAXIPG(&sblock) + 1);

                } else if (!mapcramped) {
                        printf("With %d bytes per inode, ", density);
                        printf("minimum cylinders per group is %d\n", mincpg);
                } else if (!mapcramped) {
                        printf("With %d bytes per inode, ", density);
                        printf("minimum cylinders per group is %d\n", mincpg);


@@ -267,8 +354,8 @@ mkfs(pp, fsys, fi, fo)
                if (sblock.fs_fsize != fsize)
                        printf("\t%s to be changed from %d to %d\n",
                            "and the fragment size",
                if (sblock.fs_fsize != fsize)
                        printf("\t%s to be changed from %d to %d\n",
                            "and the fragment size",

-                           bsize, sblock.fs_bsize);
-               exit(1);
+                           fsize, sblock.fs_fsize);
+               exit(23);

        }
        /* 
         * Calculate the number of cylinders per group
        }
        /* 
         * Calculate the number of cylinders per group


@@ -278,40 +365,43 @@ mkfs(pp, fsys, fi, fo)
                printf("%s groups must have a multiple of %d cylinders\n",
                        cpgflg ? "Cylinder" : "Warning: cylinder", mincpc);
                sblock.fs_cpg = roundup(sblock.fs_cpg, mincpc);
                printf("%s groups must have a multiple of %d cylinders\n",
                        cpgflg ? "Cylinder" : "Warning: cylinder", mincpc);
                sblock.fs_cpg = roundup(sblock.fs_cpg, mincpc);

+               if (!cpgflg)
+                       cpg = sblock.fs_cpg;

        }
        /*
        }
        /*

-        * Must insure there is enough space to hold block map
+        * Must ensure there is enough space for inodes.

         */
         */

-       sblock.fs_fpg = (sblock.fs_cpg * sblock.fs_spc) / NSPF(&sblock);
-       while (sblock.fs_fpg > MAXBPG(&sblock) * sblock.fs_frag) {
-               mapcramped = 1;
+       sblock.fs_ipg = roundup((sblock.fs_cpg * bpcg - used) / density,
+               INOPB(&sblock));
+       while (sblock.fs_ipg > MAXIPG(&sblock)) {
+               inodecramped = 1;

                sblock.fs_cpg -= mincpc;
                sblock.fs_cpg -= mincpc;

-               sblock.fs_fpg = (sblock.fs_cpg * sblock.fs_spc) / NSPF(&sblock);
+               sblock.fs_ipg = roundup((sblock.fs_cpg * bpcg - used) / density,
+                       INOPB(&sblock));

        }
        /*
        }
        /*

-        * Must insure there is enough space for inodes
+        * Must ensure there is enough space to hold block map.

         */
         */

-       inospercg = (sblock.fs_cpg * bpcg - used) / density;
-       while (inospercg > MAXIPG) {
-               inodecramped = 1;
+       while (CGSIZE(&sblock) > sblock.fs_bsize) {
+               mapcramped = 1;

                sblock.fs_cpg -= mincpc;
                sblock.fs_cpg -= mincpc;

-               sblock.fs_fpg = (sblock.fs_cpg * sblock.fs_spc) / NSPF(&sblock);
-               inospercg = (sblock.fs_cpg * bpcg - used) / density;
+               sblock.fs_ipg = roundup((sblock.fs_cpg * bpcg - used) / density,
+                       INOPB(&sblock));

        }
        }

+       sblock.fs_fpg = (sblock.fs_cpg * sblock.fs_spc) / NSPF(&sblock);

        if ((sblock.fs_cpg * sblock.fs_spc) % NSPB(&sblock) != 0) {
        if ((sblock.fs_cpg * sblock.fs_spc) % NSPB(&sblock) != 0) {

-               printf("newfs: panic (fs_cpg * fs_spc) % NSPF != 0");
-               exit(2);
+               printf("panic (fs_cpg * fs_spc) % NSPF != 0");
+               exit(24);

        }
        if (sblock.fs_cpg < mincpg) {
                printf("cylinder groups must have at least %d cylinders\n",
                        mincpg);
        }
        if (sblock.fs_cpg < mincpg) {
                printf("cylinder groups must have at least %d cylinders\n",
                        mincpg);

-               exit(1);
-       } else if (sblock.fs_cpg > MAXCPG) {
-               printf("cylinder groups are limited to %d cylinders\n", MAXCPG);
-               exit(1);
+               exit(25);

        } else if (sblock.fs_cpg != cpg) {
                if (!cpgflg)
                        printf("Warning: ");
        } else if (sblock.fs_cpg != cpg) {
                if (!cpgflg)
                        printf("Warning: ");

+               else if (!mapcramped && !inodecramped)
+                       exit(26);

                if (mapcramped && inodecramped)
                        printf("Block size and bytes per inode restrict");
                else if (mapcramped)
                if (mapcramped && inodecramped)
                        printf("Block size and bytes per inode restrict");
                else if (mapcramped)


@@ -320,10 +410,9 @@ mkfs(pp, fsys, fi, fo)
                        printf("Bytes per inode restrict");
                printf(" cylinders per group to %d.\n", sblock.fs_cpg);
                if (cpgflg)
                        printf("Bytes per inode restrict");
                printf(" cylinders per group to %d.\n", sblock.fs_cpg);
                if (cpgflg)

-                       exit(1);
+                       exit(27);

        }
        }

-       sblock.fs_cgsize = fragroundup(&sblock,
-           sizeof(struct cg) + howmany(sblock.fs_fpg, NBBY));
+       sblock.fs_cgsize = fragroundup(&sblock, CGSIZE(&sblock));

        /*
         * Now have size for file system and nsect and ntrak.
         * Determine number of cylinders and blocks in the file system.
        /*
         * Now have size for file system and nsect and ntrak.
         * Determine number of cylinders and blocks in the file system.


@@ -336,47 +425,72 @@ mkfs(pp, fsys, fi, fo)
        }
        if (sblock.fs_ncyl < 1) {
                printf("file systems must have at least one cylinder\n");
        }
        if (sblock.fs_ncyl < 1) {
                printf("file systems must have at least one cylinder\n");

-               exit(1);
+               exit(28);

        }
        /*
        }
        /*

-        * determine feasability/values of rotational layout tables
+        * Determine feasability/values of rotational layout tables.
+        *
+        * The size of the rotational layout tables is limited by the
+        * size of the superblock, SBSIZE. The amount of space available
+        * for tables is calculated as (SBSIZE - sizeof (struct fs)).
+        * The size of these tables is inversely proportional to the block
+        * size of the file system. The size increases if sectors per track
+        * are not powers of two, because more cylinders must be described
+        * by the tables before the rotational pattern repeats (fs_cpc).

         */
        sblock.fs_interleave = interleave;
        sblock.fs_trackskew = trackskew;
        sblock.fs_npsect = nphyssectors;
         */
        sblock.fs_interleave = interleave;
        sblock.fs_trackskew = trackskew;
        sblock.fs_npsect = nphyssectors;

+       sblock.fs_postblformat = FS_DYNAMICPOSTBLFMT;
+       sblock.fs_sbsize = fragroundup(&sblock, sizeof(struct fs));

        if (sblock.fs_ntrak == 1) {
                sblock.fs_cpc = 0;
                goto next;
        }
        if (sblock.fs_ntrak == 1) {
                sblock.fs_cpc = 0;
                goto next;
        }

-       if (sblock.fs_spc * sblock.fs_cpc > MAXBPC * NSPB(&sblock) ||
+       postblsize = sblock.fs_nrpos * sblock.fs_cpc * sizeof(short);
+       rotblsize = sblock.fs_cpc * sblock.fs_spc / NSPB(&sblock);
+       totalsbsize = sizeof(struct fs) + rotblsize;
+       if (sblock.fs_nrpos == 8 && sblock.fs_cpc <= 16) {
+               /* use old static table space */
+               sblock.fs_postbloff = (char *)(&sblock.fs_opostbl[0][0]) -
+                   (char *)(&sblock.fs_link);
+               sblock.fs_rotbloff = &sblock.fs_space[0] -
+                   (u_char *)(&sblock.fs_link);
+       } else {
+               /* use dynamic table space */
+               sblock.fs_postbloff = &sblock.fs_space[0] -
+                   (u_char *)(&sblock.fs_link);
+               sblock.fs_rotbloff = sblock.fs_postbloff + postblsize;
+               totalsbsize += postblsize;
+       }
+       if (totalsbsize > SBSIZE ||

            sblock.fs_nsect > (1 << NBBY) * NSPB(&sblock)) {
                printf("%s %s %d %s %d.%s",
                    "Warning: insufficient space in super block for\n",
                    "rotational layout tables with nsect", sblock.fs_nsect,
                    "and ntrak", sblock.fs_ntrak,
            sblock.fs_nsect > (1 << NBBY) * NSPB(&sblock)) {
                printf("%s %s %d %s %d.%s",
                    "Warning: insufficient space in super block for\n",
                    "rotational layout tables with nsect", sblock.fs_nsect,
                    "and ntrak", sblock.fs_ntrak,

-                   "\nFile system performance may be impared.\n");
+                   "\nFile system performance may be impaired.\n");

                sblock.fs_cpc = 0;
                goto next;
        }
                sblock.fs_cpc = 0;
                goto next;
        }

+       sblock.fs_sbsize = fragroundup(&sblock, totalsbsize);

        /*
         * calculate the available blocks for each rotational position
         */
        /*
         * calculate the available blocks for each rotational position
         */

-       for (cylno = 0; cylno < MAXCPG; cylno++)
-               for (rpos = 0; rpos < NRPOS; rpos++)
-                       sblock.fs_postbl[cylno][rpos] = -1;
-       blk = sblock.fs_spc * sblock.fs_cpc / NSPF(&sblock);
-       for (i = 0; i < blk; i += sblock.fs_frag)
-               /* void */;
-       for (i -= sblock.fs_frag; i >= 0; i -= sblock.fs_frag) {
+       for (cylno = 0; cylno < sblock.fs_cpc; cylno++)
+               for (rpos = 0; rpos < sblock.fs_nrpos; rpos++)
+                       fs_postbl(&sblock, cylno)[rpos] = -1;
+       for (i = (rotblsize - 1) * sblock.fs_frag;
+            i >= 0; i -= sblock.fs_frag) {

                cylno = cbtocylno(&sblock, i);
                rpos = cbtorpos(&sblock, i);
                cylno = cbtocylno(&sblock, i);
                rpos = cbtorpos(&sblock, i);

-               blk = i / sblock.fs_frag;
-               if (sblock.fs_postbl[cylno][rpos] == -1)
-                       sblock.fs_rotbl[blk] = 0;
+               blk = fragstoblks(&sblock, i);
+               if (fs_postbl(&sblock, cylno)[rpos] == -1)
+                       fs_rotbl(&sblock)[blk] = 0;

                else
                else

-                       sblock.fs_rotbl[blk] =
-                           sblock.fs_postbl[cylno][rpos] - blk;
-               sblock.fs_postbl[cylno][rpos] = blk;
+                       fs_rotbl(&sblock)[blk] =
+                           fs_postbl(&sblock, cylno)[rpos] - blk;
+               fs_postbl(&sblock, cylno)[rpos] = blk;

        }
 next:
        /*
        }
 next:
        /*


@@ -385,14 +499,6 @@ next:
        sblock.fs_ncg = sblock.fs_ncyl / sblock.fs_cpg;
        if (sblock.fs_ncyl % sblock.fs_cpg)
                sblock.fs_ncg++;
        sblock.fs_ncg = sblock.fs_ncyl / sblock.fs_cpg;
        if (sblock.fs_ncyl % sblock.fs_cpg)
                sblock.fs_ncg++;

-       /*
-        * Compute number of inode blocks per cylinder group.
-        */
-       sblock.fs_ipg = roundup(inospercg, INOPB(&sblock));
-       if (sblock.fs_ipg > MAXIPG) {
-               printf("newfs: panic fs_ipg > MAXIPG");
-               exit(3);
-       }

        sblock.fs_dblkno = sblock.fs_iblkno + sblock.fs_ipg / INOPF(&sblock);
        i = MIN(~sblock.fs_cgmask, sblock.fs_ncg - 1);
        if (cgdmin(&sblock, i) - cgbase(&sblock, i) >= sblock.fs_fpg) {
        sblock.fs_dblkno = sblock.fs_iblkno + sblock.fs_ipg / INOPF(&sblock);
        i = MIN(~sblock.fs_cgmask, sblock.fs_ncg - 1);
        if (cgdmin(&sblock, i) - cgbase(&sblock, i) >= sblock.fs_fpg) {


@@ -400,12 +506,18 @@ next:
                    cgdmin(&sblock, i) - cgbase(&sblock, i) / sblock.fs_frag,
                    sblock.fs_fpg / sblock.fs_frag);
                printf("number of cylinders per cylinder group (%d) %s.\n",
                    cgdmin(&sblock, i) - cgbase(&sblock, i) / sblock.fs_frag,
                    sblock.fs_fpg / sblock.fs_frag);
                printf("number of cylinders per cylinder group (%d) %s.\n",

-                   sblock.fs_ncg, "must be increased");
-               exit(1);
+                   sblock.fs_cpg, "must be increased");
+               exit(29);

        }
        j = sblock.fs_ncg - 1;
        if ((i = fssize - j * sblock.fs_fpg) < sblock.fs_fpg &&
            cgdmin(&sblock, j) - cgbase(&sblock, j) > i) {
        }
        j = sblock.fs_ncg - 1;
        if ((i = fssize - j * sblock.fs_fpg) < sblock.fs_fpg &&
            cgdmin(&sblock, j) - cgbase(&sblock, j) > i) {

+               if (j == 0) {
+                       printf("Filesystem must have at least %d sectors\n",
+                           NSPF(&sblock) *
+                           (cgdmin(&sblock, 0) + 3 * sblock.fs_frag));
+                       exit(30);
+               }

                printf("Warning: inode blocks/cyl group (%d) >= data blocks (%d) in last\n",
                    (cgdmin(&sblock, j) - cgbase(&sblock, j)) / sblock.fs_frag,
                    i / sblock.fs_frag);
                printf("Warning: inode blocks/cyl group (%d) >= data blocks (%d) in last\n",
                    (cgdmin(&sblock, j) - cgbase(&sblock, j)) / sblock.fs_frag,
                    i / sblock.fs_frag);


@@ -417,7 +529,7 @@ next:
                    NSPF(&sblock);
                warn = 0;
        }
                    NSPF(&sblock);
                warn = 0;
        }

-       if (warn) {
+       if (warn && !mfs) {

                printf("Warning: %d sector(s) in last cylinder unallocated\n",
                    sblock.fs_spc -
                    (fssize * NSPF(&sblock) - (sblock.fs_ncyl - 1)
                printf("Warning: %d sector(s) in last cylinder unallocated\n",
                    sblock.fs_spc -
                    (fssize * NSPF(&sblock) - (sblock.fs_ncyl - 1)


@@ -433,9 +545,6 @@ next:
        sblock.fs_csmask = ~(i - 1);
        for (sblock.fs_csshift = 0; i > 1; i >>= 1)
                sblock.fs_csshift++;
        sblock.fs_csmask = ~(i - 1);
        for (sblock.fs_csshift = 0; i > 1; i >>= 1)
                sblock.fs_csshift++;

-       i = sizeof(struct fs) +
-               howmany(sblock.fs_spc * sblock.fs_cpc, NSPB(&sblock));
-       sblock.fs_sbsize = fragroundup(&sblock, i);

        fscs = (struct csum *)calloc(1, sblock.fs_cssize);
        sblock.fs_magic = FS_MAGIC;
        sblock.fs_rotdelay = rotdelay;
        fscs = (struct csum *)calloc(1, sblock.fs_cssize);
        sblock.fs_magic = FS_MAGIC;
        sblock.fs_rotdelay = rotdelay;


@@ -456,34 +565,43 @@ next:
        /*
         * Dump out summary information about file system.
         */
        /*
         * Dump out summary information about file system.
         */

-       printf("%s:\t%d sectors in %d cylinders of %d tracks, %d sectors\n",
-           fsys, sblock.fs_size * NSPF(&sblock), sblock.fs_ncyl,
-           sblock.fs_ntrak, sblock.fs_nsect);
-       printf("\t%.1fMb in %d cyl groups (%d c/g, %.2fMb/g, %d i/g)\n",
-           (float)sblock.fs_size * sblock.fs_fsize * 1e-6, sblock.fs_ncg,
-           sblock.fs_cpg, (float)sblock.fs_fpg * sblock.fs_fsize * 1e-6,
-           sblock.fs_ipg);
+       if (!mfs) {
+               printf("%s:\t%d sectors in %d %s of %d tracks, %d sectors\n",
+                   fsys, sblock.fs_size * NSPF(&sblock), sblock.fs_ncyl,
+                   "cylinders", sblock.fs_ntrak, sblock.fs_nsect);
+#define B2MBFACTOR (1 / (1024.0 * 1024.0))
+               printf("\t%.1fMB in %d cyl groups (%d c/g, %.2fMB/g, %d i/g)\n",
+                   (float)sblock.fs_size * sblock.fs_fsize * B2MBFACTOR,
+                   sblock.fs_ncg, sblock.fs_cpg,
+                   (float)sblock.fs_fpg * sblock.fs_fsize * B2MBFACTOR,
+                   sblock.fs_ipg);
+#undef B2MBFACTOR
+       }

        /*
         * Now build the cylinders group blocks and
         * then print out indices of cylinder groups.
         */
        /*
         * Now build the cylinders group blocks and
         * then print out indices of cylinder groups.
         */

-       printf("super-block backups (for fsck -b#) at:");
+       if (!mfs)
+               printf("super-block backups (for fsck -b #) at:");

        for (cylno = 0; cylno < sblock.fs_ncg; cylno++) {
        for (cylno = 0; cylno < sblock.fs_ncg; cylno++) {

-               initcg(cylno);
+               initcg(cylno, utime);
+               if (mfs)
+                       continue;

                if (cylno % 9 == 0)
                        printf("\n");
                printf(" %d,", fsbtodb(&sblock, cgsblock(&sblock, cylno)));
        }
                if (cylno % 9 == 0)
                        printf("\n");
                printf(" %d,", fsbtodb(&sblock, cgsblock(&sblock, cylno)));
        }

-       printf("\n");
-       if (Nflag)
+       if (!mfs)
+               printf("\n");
+       if (Nflag && !mfs)

                exit(0);
        /*
         * Now construct the initial file system,
         * then write out the super-block.
         */
                exit(0);
        /*
         * Now construct the initial file system,
         * then write out the super-block.
         */

-       fsinit();
+       fsinit(utime);

        sblock.fs_time = utime;
        sblock.fs_time = utime;

-       wtfs(SBOFF / sectorsize, sbsize, (char *)&sblock);
+       wtfs((int)SBOFF / sectorsize, sbsize, (char *)&sblock);

        for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize)
                wtfs(fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)),
                        sblock.fs_cssize - i < sblock.fs_bsize ?
        for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize)
                wtfs(fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)),
                        sblock.fs_cssize - i < sblock.fs_bsize ?


@@ -503,15 +621,28 @@ next:
        pp->p_fsize = sblock.fs_fsize;
        pp->p_frag = sblock.fs_frag;
        pp->p_cpg = sblock.fs_cpg;
        pp->p_fsize = sblock.fs_fsize;
        pp->p_frag = sblock.fs_frag;
        pp->p_cpg = sblock.fs_cpg;

+       /*
+        * Notify parent process of success.
+        * Dissociate from session and tty.
+        */
+       if (mfs) {
+               kill(ppid, SIGUSR1);
+               (void) setsid();
+               (void) close(0);
+               (void) close(1);
+               (void) close(2);
+               (void) chdir("/");
+       }

 }
 
 /*
  * Initialize a cylinder group.
  */
 }
 
 /*
  * Initialize a cylinder group.
  */

-initcg(cylno)
+initcg(cylno, utime)

        int cylno;
        int cylno;

+       time_t utime;

 {
 {

-       daddr_t cbase, d, dlower, dupper, dmax;
+       daddr_t cbase, d, dlower, dupper, dmax, blkno;

        long i, j, s;
        register struct csum *cs;
 
        long i, j, s;
        register struct csum *cs;
 


@@ -526,7 +657,10 @@ initcg(cylno)
                dmax = sblock.fs_size;
        dlower = cgsblock(&sblock, cylno) - cbase;
        dupper = cgdmin(&sblock, cylno) - cbase;
                dmax = sblock.fs_size;
        dlower = cgsblock(&sblock, cylno) - cbase;
        dupper = cgdmin(&sblock, cylno) - cbase;

+       if (cylno == 0)
+               dupper += howmany(sblock.fs_cssize, sblock.fs_fsize);

        cs = fscs + cylno;
        cs = fscs + cylno;

+       bzero(&acg, sblock.fs_cgsize);

        acg.cg_time = utime;
        acg.cg_magic = CG_MAGIC;
        acg.cg_cgx = cylno;
        acg.cg_time = utime;
        acg.cg_magic = CG_MAGIC;
        acg.cg_cgx = cylno;


@@ -536,83 +670,112 @@ initcg(cylno)
                acg.cg_ncyl = sblock.fs_cpg;
        acg.cg_niblk = sblock.fs_ipg;
        acg.cg_ndblk = dmax - cbase;
                acg.cg_ncyl = sblock.fs_cpg;
        acg.cg_niblk = sblock.fs_ipg;
        acg.cg_ndblk = dmax - cbase;

-       acg.cg_cs.cs_ndir = 0;
-       acg.cg_cs.cs_nffree = 0;
-       acg.cg_cs.cs_nbfree = 0;
-       acg.cg_cs.cs_nifree = 0;
-       acg.cg_rotor = 0;
-       acg.cg_frotor = 0;
-       acg.cg_irotor = 0;
-       for (i = 0; i < sblock.fs_frag; i++) {
-               acg.cg_frsum[i] = 0;
-       }
-       for (i = 0; i < sblock.fs_ipg; ) {
-               for (j = INOPB(&sblock); j > 0; j--) {
-                       clrbit(acg.cg_iused, i);
-                       i++;
-               }
-               acg.cg_cs.cs_nifree += INOPB(&sblock);
+       if (sblock.fs_contigsumsize > 0)
+               acg.cg_nclusterblks = acg.cg_ndblk / sblock.fs_frag;
+       acg.cg_btotoff = &acg.cg_space[0] - (u_char *)(&acg.cg_link);
+       acg.cg_boff = acg.cg_btotoff + sblock.fs_cpg * sizeof(long);
+       acg.cg_iusedoff = acg.cg_boff + 
+               sblock.fs_cpg * sblock.fs_nrpos * sizeof(short);
+       acg.cg_freeoff = acg.cg_iusedoff + howmany(sblock.fs_ipg, NBBY);
+       if (sblock.fs_contigsumsize <= 0) {
+               acg.cg_nextfreeoff = acg.cg_freeoff +
+                  howmany(sblock.fs_cpg * sblock.fs_spc / NSPF(&sblock), NBBY);
+       } else {
+               acg.cg_clustersumoff = acg.cg_freeoff + howmany
+                   (sblock.fs_cpg * sblock.fs_spc / NSPF(&sblock), NBBY) -
+                   sizeof(long);
+               acg.cg_clustersumoff =
+                   roundup(acg.cg_clustersumoff, sizeof(long));
+               acg.cg_clusteroff = acg.cg_clustersumoff +
+                   (sblock.fs_contigsumsize + 1) * sizeof(long);
+               acg.cg_nextfreeoff = acg.cg_clusteroff + howmany
+                   (sblock.fs_cpg * sblock.fs_spc / NSPB(&sblock), NBBY);
+       }
+       if (acg.cg_nextfreeoff - (long)(&acg.cg_link) > sblock.fs_cgsize) {
+               printf("Panic: cylinder group too big\n");
+               exit(37);

        }
        }

+       acg.cg_cs.cs_nifree += sblock.fs_ipg;

        if (cylno == 0)
                for (i = 0; i < ROOTINO; i++) {
        if (cylno == 0)
                for (i = 0; i < ROOTINO; i++) {

-                       setbit(acg.cg_iused, i);
+                       setbit(cg_inosused(&acg), i);

                        acg.cg_cs.cs_nifree--;
                }
                        acg.cg_cs.cs_nifree--;
                }

-       while (i < MAXIPG) {
-               clrbit(acg.cg_iused, i);
-               i++;
-       }
-       wtfs(fsbtodb(&sblock, cgimin(&sblock, cylno)),
-           sblock.fs_ipg * sizeof (struct dinode), (char *)zino);
-       for (i = 0; i < MAXCPG; i++) {
-               acg.cg_btot[i] = 0;
-               for (j = 0; j < NRPOS; j++)
-                       acg.cg_b[i][j] = 0;
-       }
-       if (cylno == 0) {
+       for (i = 0; i < sblock.fs_ipg / INOPF(&sblock); i += sblock.fs_frag)
+               wtfs(fsbtodb(&sblock, cgimin(&sblock, cylno) + i),
+                   sblock.fs_bsize, (char *)zino);
+       if (cylno > 0) {

                /*
                /*

-                * reserve space for summary info and Boot block
+                * In cylno 0, beginning space is reserved
+                * for boot and super blocks.

                 */
                 */

-               dupper += howmany(sblock.fs_cssize, sblock.fs_fsize);
-               for (d = 0; d < dlower; d += sblock.fs_frag)
-                       clrblock(&sblock, acg.cg_free, d/sblock.fs_frag);
-       } else {

                for (d = 0; d < dlower; d += sblock.fs_frag) {
                for (d = 0; d < dlower; d += sblock.fs_frag) {

-                       setblock(&sblock, acg.cg_free, d/sblock.fs_frag);
+                       blkno = d / sblock.fs_frag;
+                       setblock(&sblock, cg_blksfree(&acg), blkno);
+                       if (sblock.fs_contigsumsize > 0)
+                               setbit(cg_clustersfree(&acg), blkno);

                        acg.cg_cs.cs_nbfree++;
                        acg.cg_cs.cs_nbfree++;

-                       acg.cg_btot[cbtocylno(&sblock, d)]++;
-                       acg.cg_b[cbtocylno(&sblock, d)][cbtorpos(&sblock, d)]++;
+                       cg_blktot(&acg)[cbtocylno(&sblock, d)]++;
+                       cg_blks(&sblock, &acg, cbtocylno(&sblock, d))
+                           [cbtorpos(&sblock, d)]++;

                }
                sblock.fs_dsize += dlower;
        }
        sblock.fs_dsize += acg.cg_ndblk - dupper;
                }
                sblock.fs_dsize += dlower;
        }
        sblock.fs_dsize += acg.cg_ndblk - dupper;

-       for (; d < dupper; d += sblock.fs_frag)
-               clrblock(&sblock, acg.cg_free, d/sblock.fs_frag);
-       if (d > dupper) {
-               acg.cg_frsum[d - dupper]++;
-               for (i = d - 1; i >= dupper; i--) {
-                       setbit(acg.cg_free, i);
+       if (i = dupper % sblock.fs_frag) {
+               acg.cg_frsum[sblock.fs_frag - i]++;
+               for (d = dupper + sblock.fs_frag - i; dupper < d; dupper++) {
+                       setbit(cg_blksfree(&acg), dupper);

                        acg.cg_cs.cs_nffree++;
                }
        }
                        acg.cg_cs.cs_nffree++;
                }
        }

-       while ((d + sblock.fs_frag) <= dmax - cbase) {
-               setblock(&sblock, acg.cg_free, d/sblock.fs_frag);
+       for (d = dupper; d + sblock.fs_frag <= dmax - cbase; ) {
+               blkno = d / sblock.fs_frag;
+               setblock(&sblock, cg_blksfree(&acg), blkno);
+               if (sblock.fs_contigsumsize > 0)
+                       setbit(cg_clustersfree(&acg), blkno);

                acg.cg_cs.cs_nbfree++;
                acg.cg_cs.cs_nbfree++;

-               acg.cg_btot[cbtocylno(&sblock, d)]++;
-               acg.cg_b[cbtocylno(&sblock, d)][cbtorpos(&sblock, d)]++;
+               cg_blktot(&acg)[cbtocylno(&sblock, d)]++;
+               cg_blks(&sblock, &acg, cbtocylno(&sblock, d))
+                   [cbtorpos(&sblock, d)]++;

                d += sblock.fs_frag;
        }
        if (d < dmax - cbase) {
                acg.cg_frsum[dmax - cbase - d]++;
                for (; d < dmax - cbase; d++) {
                d += sblock.fs_frag;
        }
        if (d < dmax - cbase) {
                acg.cg_frsum[dmax - cbase - d]++;
                for (; d < dmax - cbase; d++) {

-                       setbit(acg.cg_free, d);
+                       setbit(cg_blksfree(&acg), d);

                        acg.cg_cs.cs_nffree++;
                }
                        acg.cg_cs.cs_nffree++;
                }

-               for (; d % sblock.fs_frag != 0; d++)
-                       clrbit(acg.cg_free, d);

        }
        }

-       for (d /= sblock.fs_frag; d < MAXBPG(&sblock); d ++)
-               clrblock(&sblock, acg.cg_free, d);
+       if (sblock.fs_contigsumsize > 0) {
+               long *sump = cg_clustersum(&acg);
+               u_char *mapp = cg_clustersfree(&acg);
+               int map = *mapp++;
+               int bit = 1;
+               int run = 0;
+
+               for (i = 0; i < acg.cg_nclusterblks; i++) {
+                       if ((map & bit) != 0) {
+                               run++;
+                       } else if (run != 0) {
+                               if (run > sblock.fs_contigsumsize)
+                                       run = sblock.fs_contigsumsize;
+                               sump[run]++;
+                               run = 0;
+                       }
+                       if ((i & (NBBY - 1)) != (NBBY - 1)) {
+                               bit <<= 1;
+                       } else {
+                               map = *mapp++;
+                               bit = 1;
+                       }
+               }
+               if (run != 0) {
+                       if (run > sblock.fs_contigsumsize)
+                               run = sblock.fs_contigsumsize;
+                       sump[run]++;
+               }
+       }

        sblock.fs_cstotal.cs_ndir += acg.cg_cs.cs_ndir;
        sblock.fs_cstotal.cs_nffree += acg.cg_cs.cs_nffree;
        sblock.fs_cstotal.cs_nbfree += acg.cg_cs.cs_nbfree;
        sblock.fs_cstotal.cs_ndir += acg.cg_cs.cs_ndir;
        sblock.fs_cstotal.cs_nffree += acg.cg_cs.cs_nffree;
        sblock.fs_cstotal.cs_nbfree += acg.cg_cs.cs_nbfree;


@@ -625,7 +788,7 @@ initcg(cylno)
 /*
  * initialize the file system
  */
 /*
  * initialize the file system
  */

-struct inode node;
+struct dinode node;

 
 #ifdef LOSTDIR
 #define PREDEFDIR 3
 
 #ifdef LOSTDIR
 #define PREDEFDIR 3


@@ -634,6 +797,18 @@ struct inode node;
 #endif
 
 struct direct root_dir[] = {
 #endif
 
 struct direct root_dir[] = {

+       { ROOTINO, sizeof(struct direct), DT_DIR, 1, "." },
+       { ROOTINO, sizeof(struct direct), DT_DIR, 2, ".." },
+#ifdef LOSTDIR
+       { LOSTFOUNDINO, sizeof(struct direct), DT_DIR, 10, "lost+found" },
+#endif
+};
+struct odirect {
+       u_long  d_ino;
+       u_short d_reclen;
+       u_short d_namlen;
+       u_char  d_name[MAXNAMLEN + 1];
+} oroot_dir[] = {

        { ROOTINO, sizeof(struct direct), 1, "." },
        { ROOTINO, sizeof(struct direct), 2, ".." },
 #ifdef LOSTDIR
        { ROOTINO, sizeof(struct direct), 1, "." },
        { ROOTINO, sizeof(struct direct), 2, ".." },
 #ifdef LOSTDIR


@@ -642,6 +817,11 @@ struct direct root_dir[] = {
 };
 #ifdef LOSTDIR
 struct direct lost_found_dir[] = {
 };
 #ifdef LOSTDIR
 struct direct lost_found_dir[] = {

+       { LOSTFOUNDINO, sizeof(struct direct), DT_DIR, 1, "." },
+       { ROOTINO, sizeof(struct direct), DT_DIR, 2, ".." },
+       { 0, DIRBLKSIZ, 0, 0, 0 },
+};
+struct odirect olost_found_dir[] = {

        { LOSTFOUNDINO, sizeof(struct direct), 1, "." },
        { ROOTINO, sizeof(struct direct), 2, ".." },
        { 0, DIRBLKSIZ, 0, 0 },
        { LOSTFOUNDINO, sizeof(struct direct), 1, "." },
        { ROOTINO, sizeof(struct direct), 2, ".." },
        { 0, DIRBLKSIZ, 0, 0 },


@@ -649,43 +829,56 @@ struct direct lost_found_dir[] = {
 #endif
 char buf[MAXBSIZE];
 
 #endif
 char buf[MAXBSIZE];
 

-fsinit()
+fsinit(utime)
+       time_t utime;

 {
        int i;
 
        /*
         * initialize the node
         */
 {
        int i;
 
        /*
         * initialize the node
         */

-       node.i_atime = utime;
-       node.i_mtime = utime;
-       node.i_ctime = utime;
+       node.di_atime.ts_sec = utime;
+       node.di_mtime.ts_sec = utime;
+       node.di_ctime.ts_sec = utime;

 #ifdef LOSTDIR
        /*
         * create the lost+found directory
         */
 #ifdef LOSTDIR
        /*
         * create the lost+found directory
         */

-       (void)makedir(lost_found_dir, 2);
-       for (i = DIRBLKSIZ; i < sblock.fs_bsize; i += DIRBLKSIZ)
-               bcopy(&lost_found_dir[2], &buf[i], DIRSIZ(&lost_found_dir[2]));
-       node.i_number = LOSTFOUNDINO;
-       node.i_mode = IFDIR | UMASK;
-       node.i_nlink = 2;
-       node.i_size = sblock.fs_bsize;
-       node.i_db[0] = alloc(node.i_size, node.i_mode);
-       node.i_blocks = btodb(fragroundup(&sblock, node.i_size));
-       wtfs(fsbtodb(&sblock, node.i_db[0]), node.i_size, buf);
-       iput(&node);
+       if (Oflag) {
+               (void)makedir((struct direct *)olost_found_dir, 2);
+               for (i = DIRBLKSIZ; i < sblock.fs_bsize; i += DIRBLKSIZ)
+                       bcopy(&olost_found_dir[2], &buf[i],
+                           DIRSIZ(0, &olost_found_dir[2]));
+       } else {
+               (void)makedir(lost_found_dir, 2);
+               for (i = DIRBLKSIZ; i < sblock.fs_bsize; i += DIRBLKSIZ)
+                       bcopy(&lost_found_dir[2], &buf[i],
+                           DIRSIZ(0, &lost_found_dir[2]));
+       }
+       node.di_mode = IFDIR | UMASK;
+       node.di_nlink = 2;
+       node.di_size = sblock.fs_bsize;
+       node.di_db[0] = alloc(node.di_size, node.di_mode);
+       node.di_blocks = btodb(fragroundup(&sblock, node.di_size));
+       wtfs(fsbtodb(&sblock, node.di_db[0]), node.di_size, buf);
+       iput(&node, LOSTFOUNDINO);

 #endif
        /*
         * create the root directory
         */
 #endif
        /*
         * create the root directory
         */

-       node.i_number = ROOTINO;
-       node.i_mode = IFDIR | UMASK;
-       node.i_nlink = PREDEFDIR;
-       node.i_size = makedir(root_dir, PREDEFDIR);
-       node.i_db[0] = alloc(sblock.fs_fsize, node.i_mode);
-       node.i_blocks = btodb(fragroundup(&sblock, node.i_size));
-       wtfs(fsbtodb(&sblock, node.i_db[0]), sblock.fs_fsize, buf);
-       iput(&node);
+       if (mfs)
+               node.di_mode = IFDIR | 01777;
+       else
+               node.di_mode = IFDIR | UMASK;
+       node.di_nlink = PREDEFDIR;
+       if (Oflag)
+               node.di_size = makedir((struct direct *)oroot_dir, PREDEFDIR);
+       else
+               node.di_size = makedir(root_dir, PREDEFDIR);
+       node.di_db[0] = alloc(sblock.fs_fsize, node.di_mode);
+       node.di_blocks = btodb(fragroundup(&sblock, node.di_size));
+       wtfs(fsbtodb(&sblock, node.di_db[0]), sblock.fs_fsize, buf);
+       iput(&node, ROOTINO);

 }
 
 /*
 }
 
 /*


@@ -701,13 +894,13 @@ makedir(protodir, entries)
 
        spcleft = DIRBLKSIZ;
        for (cp = buf, i = 0; i < entries - 1; i++) {
 
        spcleft = DIRBLKSIZ;
        for (cp = buf, i = 0; i < entries - 1; i++) {

-               protodir[i].d_reclen = DIRSIZ(&protodir[i]);
+               protodir[i].d_reclen = DIRSIZ(0, &protodir[i]);

                bcopy(&protodir[i], cp, protodir[i].d_reclen);
                cp += protodir[i].d_reclen;
                spcleft -= protodir[i].d_reclen;
        }
        protodir[i].d_reclen = spcleft;
                bcopy(&protodir[i], cp, protodir[i].d_reclen);
                cp += protodir[i].d_reclen;
                spcleft -= protodir[i].d_reclen;
        }
        protodir[i].d_reclen = spcleft;

-       bcopy(&protodir[i], cp, DIRSIZ(&protodir[i]));
+       bcopy(&protodir[i], cp, DIRSIZ(0, &protodir[i]));

        return (DIRBLKSIZ);
 }
 
        return (DIRBLKSIZ);
 }
 


@@ -720,7 +913,7 @@ alloc(size, mode)
        int mode;
 {
        int i, frag;
        int mode;
 {
        int i, frag;

-       daddr_t d;
+       daddr_t d, blkno;

 
        rdfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);
 
        rdfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);


@@ -733,12 +926,14 @@ alloc(size, mode)
                return (0);
        }
        for (d = 0; d < acg.cg_ndblk; d += sblock.fs_frag)
                return (0);
        }
        for (d = 0; d < acg.cg_ndblk; d += sblock.fs_frag)

-               if (isblock(&sblock, acg.cg_free, d / sblock.fs_frag))
+               if (isblock(&sblock, cg_blksfree(&acg), d / sblock.fs_frag))

                        goto goth;
        printf("internal error: can't find block in cyl 0\n");
        return (0);
 goth:
                        goto goth;
        printf("internal error: can't find block in cyl 0\n");
        return (0);
 goth:

-       clrblock(&sblock, acg.cg_free, d / sblock.fs_frag);
+       blkno = fragstoblks(&sblock, d);
+       clrblock(&sblock, cg_blksfree(&acg), blkno);
+       clrbit(cg_clustersfree(&acg), blkno);

        acg.cg_cs.cs_nbfree--;
        sblock.fs_cstotal.cs_nbfree--;
        fscs[0].cs_nbfree--;
        acg.cg_cs.cs_nbfree--;
        sblock.fs_cstotal.cs_nbfree--;
        fscs[0].cs_nbfree--;


@@ -747,8 +942,8 @@ goth:
                sblock.fs_cstotal.cs_ndir++;
                fscs[0].cs_ndir++;
        }
                sblock.fs_cstotal.cs_ndir++;
                fscs[0].cs_ndir++;
        }

-       acg.cg_btot[cbtocylno(&sblock, d)]--;
-       acg.cg_b[cbtocylno(&sblock, d)][cbtorpos(&sblock, d)]--;
+       cg_blktot(&acg)[cbtocylno(&sblock, d)]--;
+       cg_blks(&sblock, &acg, cbtocylno(&sblock, d))[cbtorpos(&sblock, d)]--;

        if (size != sblock.fs_bsize) {
                frag = howmany(size, sblock.fs_fsize);
                fscs[0].cs_nffree += sblock.fs_frag - frag;
        if (size != sblock.fs_bsize) {
                frag = howmany(size, sblock.fs_fsize);
                fscs[0].cs_nffree += sblock.fs_frag - frag;


@@ -756,7 +951,7 @@ goth:
                acg.cg_cs.cs_nffree += sblock.fs_frag - frag;
                acg.cg_frsum[sblock.fs_frag - frag]++;
                for (i = frag; i < sblock.fs_frag; i++)
                acg.cg_cs.cs_nffree += sblock.fs_frag - frag;
                acg.cg_frsum[sblock.fs_frag - frag]++;
                for (i = frag; i < sblock.fs_frag; i++)

-                       setbit(acg.cg_free, d + i);
+                       setbit(cg_blksfree(&acg), d + i);

        }
        wtfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);
        }
        wtfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);


@@ -766,37 +961,121 @@ goth:
 /*
  * Allocate an inode on the disk
  */
 /*
  * Allocate an inode on the disk
  */

-iput(ip)
-       register struct inode *ip;
+iput(ip, ino)
+       register struct dinode *ip;
+       register ino_t ino;

 {
        struct dinode buf[MAXINOPB];
        daddr_t d;
        int c;
 
 {
        struct dinode buf[MAXINOPB];
        daddr_t d;
        int c;
 

-       c = itog(&sblock, ip->i_number);
+       c = ino_to_cg(&sblock, ino);

        rdfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);
        if (acg.cg_magic != CG_MAGIC) {
                printf("cg 0: bad magic number\n");
        rdfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);
        if (acg.cg_magic != CG_MAGIC) {
                printf("cg 0: bad magic number\n");

-               exit(1);
+               exit(31);

        }
        acg.cg_cs.cs_nifree--;
        }
        acg.cg_cs.cs_nifree--;

-       setbit(acg.cg_iused, ip->i_number);
+       setbit(cg_inosused(&acg), ino);

        wtfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);
        sblock.fs_cstotal.cs_nifree--;
        fscs[0].cs_nifree--;
        wtfs(fsbtodb(&sblock, cgtod(&sblock, 0)), sblock.fs_cgsize,
            (char *)&acg);
        sblock.fs_cstotal.cs_nifree--;
        fscs[0].cs_nifree--;

-       if(ip->i_number >= sblock.fs_ipg * sblock.fs_ncg) {
-               printf("fsinit: inode value out of range (%d).\n",
-                   ip->i_number);
-               exit(1);
+       if (ino >= sblock.fs_ipg * sblock.fs_ncg) {
+               printf("fsinit: inode value out of range (%d).\n", ino);
+               exit(32);

        }
        }

-       d = fsbtodb(&sblock, itod(&sblock, ip->i_number));
+       d = fsbtodb(&sblock, ino_to_fsba(&sblock, ino));

        rdfs(d, sblock.fs_bsize, buf);
        rdfs(d, sblock.fs_bsize, buf);

-       buf[itoo(&sblock, ip->i_number)].di_ic = ip->i_ic;
+       buf[ino_to_fsbo(&sblock, ino)] = *ip;

        wtfs(d, sblock.fs_bsize, buf);
 }
 
        wtfs(d, sblock.fs_bsize, buf);
 }
 

+/*
+ * Notify parent process that the filesystem has created itself successfully.
+ */
+void
+started()
+{
+
+       exit(0);
+}
+
+/*
+ * Replace libc function with one suited to our needs.
+ */
+caddr_t
+malloc(size)
+       register u_long size;
+{
+       char *base, *i;
+       static u_long pgsz;
+       struct rlimit rlp;
+
+       if (pgsz == 0) {
+               base = sbrk(0);
+               pgsz = getpagesize() - 1;
+               i = (char *)((u_long)(base + pgsz) &~ pgsz);
+               base = sbrk(i - base);
+               if (getrlimit(RLIMIT_DATA, &rlp) < 0)
+                       perror("getrlimit");
+               rlp.rlim_cur = rlp.rlim_max;
+               if (setrlimit(RLIMIT_DATA, &rlp) < 0)
+                       perror("setrlimit");
+               memleft = rlp.rlim_max - (u_long)base;
+       }
+       size = (size + pgsz) &~ pgsz;
+       if (size > memleft)
+               size = memleft;
+       memleft -= size;
+       if (size == 0)
+               return (0);
+       return ((caddr_t)sbrk(size));
+}
+
+/*
+ * Replace libc function with one suited to our needs.
+ */
+caddr_t
+realloc(ptr, size)
+       char *ptr;
+       u_long size;
+{
+       void *p;
+
+       if ((p = malloc(size)) == NULL)
+               return (NULL);
+       bcopy(ptr, p, size);
+       free(ptr);
+       return (p);
+}
+
+/*
+ * Replace libc function with one suited to our needs.
+ */
+char *
+calloc(size, numelm)
+       u_long size, numelm;
+{
+       caddr_t base;
+
+       size *= numelm;
+       base = malloc(size);
+       bzero(base, size);
+       return (base);
+}
+
+/*
+ * Replace libc function with one suited to our needs.
+ */
+free(ptr)
+       char *ptr;
+{
+       
+       /* do not worry about it for now */
+}
+

 /*
  * read a block from the file system
  */
 /*
  * read a block from the file system
  */


@@ -807,16 +1086,20 @@ rdfs(bno, size, bf)
 {
        int n;
 
 {
        int n;
 

-       if (lseek(fsi, bno * sectorsize, 0) < 0) {
+       if (mfs) {
+               bcopy(membase + bno * sectorsize, bf, size);
+               return;
+       }
+       if (lseek(fsi, (off_t)bno * sectorsize, 0) < 0) {

                printf("seek error: %ld\n", bno);
                perror("rdfs");
                printf("seek error: %ld\n", bno);
                perror("rdfs");

-               exit(1);
+               exit(33);

        }
        n = read(fsi, bf, size);
        }
        n = read(fsi, bf, size);

-       if(n != size) {
+       if (n != size) {

                printf("read error: %ld\n", bno);
                perror("rdfs");
                printf("read error: %ld\n", bno);
                perror("rdfs");

-               exit(1);
+               exit(34);

        }
 }
 
        }
 }
 


@@ -830,18 +1113,22 @@ wtfs(bno, size, bf)
 {
        int n;
 
 {
        int n;
 

+       if (mfs) {
+               bcopy(bf, membase + bno * sectorsize, size);
+               return;
+       }

        if (Nflag)
                return;
        if (Nflag)
                return;

-       if (lseek(fso, bno * sectorsize, 0) < 0) {
+       if (lseek(fso, (off_t)bno * sectorsize, SEEK_SET) < 0) {

                printf("seek error: %ld\n", bno);
                perror("wtfs");
                printf("seek error: %ld\n", bno);
                perror("wtfs");

-               exit(1);
+               exit(35);

        }
        n = write(fso, bf, size);
        }
        n = write(fso, bf, size);

-       if(n != size) {
-               printf("write error: %D\n", bno);
+       if (n != size) {
+               printf("write error: %ld\n", bno);

                perror("wtfs");
                perror("wtfs");

-               exit(1);
+               exit(36);

        }
 }
 
        }
 }
 


@@ -873,7 +1160,7 @@ isblock(fs, cp, h)
 #else
                fprintf(stderr, "isblock bad fs_frag %d\n", fs->fs_frag);
 #endif
 #else
                fprintf(stderr, "isblock bad fs_frag %d\n", fs->fs_frag);
 #endif

-               return;
+               return (0);

        }
 }
 
        }
 }