make MNT_ASYNC the default for mfs, allow -T for mfs

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

diff --git a/usr/src/sbin/newfs/newfs.c b/usr/src/sbin/newfs/newfs.c
index 490562e..04cd5cc 100644 (file)
--- a/usr/src/sbin/newfs/newfs.c
+++ b/usr/src/sbin/newfs/newfs.c
@@ -1,34 +1,63 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983, 1989, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif not lint
+static char sccsid[] = "@(#)newfs.c    8.7 (Berkeley) %G%";
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)newfs.c    6.10 (Berkeley) %G%";
-#endif not lint
+static char copyright[] =
+"@(#) Copyright (c) 1983, 1989, 1993, 1994\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */

 
 /*
  * newfs: friendly front end to mkfs
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 
 /*
  * newfs: friendly front end to mkfs
  */
 #include <sys/param.h>
 #include <sys/stat.h>

-#include <sys/fs.h>
-#include <sys/dir.h>

 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/file.h>

+#include <sys/mount.h>
+
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>

 
 

-#include <stdio.h>

 #include <ctype.h>
 #include <ctype.h>

+#include <errno.h>
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+#include "mntopts.h"
+
+struct mntopt mopts[] = {
+       MOPT_STDOPTS,
+       MOPT_ASYNC,
+       { NULL },
+};
+
+#if __STDC__
+void   fatal(const char *fmt, ...);
+#else
+void   fatal();
+#endif

 
 

-#define COMPAT                 /* allow non-labeled disks */
+#define        COMPAT                  /* allow non-labeled disks */

 
 /*
  * The following two constants set the default block and fragment sizes.
 
 /*
  * The following two constants set the default block and fragment sizes.


@@ -41,9 +70,9 @@ static char sccsid[] = "@(#)newfs.c   6.10 (Berkeley) %G%";
 #define        DFL_BLKSIZE     8192
 
 /*
 #define        DFL_BLKSIZE     8192
 
 /*

- * Cylinder groups may have up to MAXCPG cylinders. The actual
+ * Cylinder groups may have up to many cylinders. The actual

  * number used depends upon how much information can be stored
  * number used depends upon how much information can be stored

- * on a single cylinder. The default is to used 16 cylinders
+ * on a single cylinder. The default is to use 16 cylinders

  * per group.
  */
 #define        DESCPG          16      /* desired fs_cpg */
  * per group.
  */
 #define        DESCPG          16      /* desired fs_cpg */


@@ -54,11 +83,11 @@ static char sccsid[] = "@(#)newfs.c 6.10 (Berkeley) %G%";
  * only the superuser may continue to allocate blocks. This may
  * be set to 0 if no reserve of free blocks is deemed necessary,
  * however throughput drops by fifty percent if the file system
  * only the superuser may continue to allocate blocks. This may
  * be set to 0 if no reserve of free blocks is deemed necessary,
  * however throughput drops by fifty percent if the file system

- * is run at between 90% and 100% full; thus the default value of
- * fs_minfree is 10%. With 10% free space, fragmentation is not a
+ * is run at between 95% and 100% full; thus the default value of
+ * fs_minfree is 5%. With 5% free space, fragmentation is not a

  * problem, so we choose to optimize for time.
  */
  * problem, so we choose to optimize for time.
  */

-#define MINFREE                10
+#define MINFREE                5

 #define DEFAULTOPT     FS_OPTTIME
 
 /*
 #define DEFAULTOPT     FS_OPTTIME
 
 /*


@@ -70,21 +99,32 @@ static char sccsid[] = "@(#)newfs.c 6.10 (Berkeley) %G%";
 #define ROTDELAY       4
 
 /*
 #define ROTDELAY       4
 
 /*

- * MAXCONTIG sets the default for the maximum number of blocks
- * that may be allocated sequentially. Since UNIX drivers are
- * not capable of scheduling multi-block transfers, this defaults
- * to 1 (ie no contiguous blocks are allocated).
+ * MAXBLKPG determines the maximum number of data blocks which are
+ * placed in a single cylinder group. The default is one indirect
+ * block worth of data blocks.

  */
  */

-#define MAXCONTIG      1
+#define MAXBLKPG(bsize)        ((bsize) / sizeof(daddr_t))

 
 /*
  * Each file system has a number of inodes statically allocated.
 
 /*
  * Each file system has a number of inodes statically allocated.

- * We allocate one inode slot per NBPI bytes, expecting this
+ * We allocate one inode slot per NFPI fragments, expecting this

  * to be far more than we will ever need.
  */
  * to be far more than we will ever need.
  */

-#define        NBPI            2048
+#define        NFPI            4

 
 

+/*
+ * For each cylinder we keep track of the availability of blocks at different
+ * rotational positions, so that we can lay out the data to be picked
+ * up with minimum rotational latency.  NRPOS is the default number of
+ * rotational positions that we distinguish.  With NRPOS of 8 the resolution
+ * of our summary information is 2ms for a typical 3600 rpm drive.
+ */
+#define        NRPOS           8       /* number distinct rotational positions */
+
+
+int    mfs;                    /* run as the memory based filesystem */

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

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

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


@@ -107,266 +147,244 @@ int     cpg = DESCPG;           /* cylinders/cylinder group */
 int    cpgflg;                 /* cylinders/cylinder group flag was given */
 int    minfree = MINFREE;      /* free space threshold */
 int    opt = DEFAULTOPT;       /* optimization preference (space or time) */
 int    cpgflg;                 /* cylinders/cylinder group flag was given */
 int    minfree = MINFREE;      /* free space threshold */
 int    opt = DEFAULTOPT;       /* optimization preference (space or time) */

-int    density = NBPI;         /* number of bytes per inode */
-int    maxcontig = MAXCONTIG;  /* max contiguous blocks to allocate */
+int    density;                /* number of bytes per inode */
+int    maxcontig = 0;          /* max contiguous blocks to allocate */

 int    rotdelay = ROTDELAY;    /* rotational delay between blocks */
 int    rotdelay = ROTDELAY;    /* rotational delay between blocks */

+int    maxbpg;                 /* maximum blocks per file in a cyl group */
+int    nrpos = NRPOS;          /* # of distinguished rotational positions */

 int    bbsize = BBSIZE;        /* boot block size */
 int    sbsize = SBSIZE;        /* superblock size */
 int    bbsize = BBSIZE;        /* boot block size */
 int    sbsize = SBSIZE;        /* superblock size */

+int    mntflags = MNT_ASYNC;   /* flags to be passed to mount */
+u_long memleft;                /* virtual memory available */
+caddr_t        membase;                /* start address of memory based filesystem */

 #ifdef COMPAT
 #ifdef COMPAT

-int    unlabelled;
+char   *disktype;
+int    unlabeled;

 #endif
 
 char   device[MAXPATHLEN];
 #endif
 
 char   device[MAXPATHLEN];

+char   *progname;

 
 

-extern int errno;
-char   *index();
-char   *rindex();
-char   *sprintf();
-
+int

 main(argc, argv)
        int argc;
        char *argv[];
 {
 main(argc, argv)
        int argc;
        char *argv[];
 {

-       char *cp, *special;
+       extern char *optarg;
+       extern int optind;
+       register int ch;

        register struct partition *pp;
        register struct disklabel *lp;
        struct disklabel *getdisklabel();
        struct partition oldpartition;
        struct stat st;
        register struct partition *pp;
        register struct disklabel *lp;
        struct disklabel *getdisklabel();
        struct partition oldpartition;
        struct stat st;

-       int fsi, fso;
-       register int i;
-       int status;
-
-       argc--, argv++;
-       while (argc > 0 && argv[0][0] == '-') {
-               for (cp = &argv[0][1]; *cp; cp++)
-                       switch (*cp) {
-
-                       case 'N':
-                               Nflag++;
-                               break;
-
-                       case 'S':
-                               if (argc < 1)
-                                       fatal("-S: missing sector size");
-                               argc--, argv++;
-                               sectorsize = atoi(*argv);
-                               if (sectorsize <= 0)
-                                       fatal("%s: bad sector size", *argv);
-                               goto next;
-
-                       case 'a':
-                               if (argc < 1)
-                                       fatal("-a: spare sectors per cylinder");
-                               argc--, argv++;
-                               cylspares = atoi(*argv);
-                               if (cylspares < 0)
-                                       fatal("%s: bad spare sectors per cylinder", *argv);
-                               goto next;
-
-                       case 'b':
-                               if (argc < 1)
-                                       fatal("-b: missing block size");
-                               argc--, argv++;
-                               bsize = atoi(*argv);
-                               if (bsize < MINBSIZE)
-                                       fatal("%s: bad block size", *argv);
-                               goto next;
-
-                       case 'c':
-                               if (argc < 1)
-                                       fatal("-c: missing cylinders/group");
-                               argc--, argv++;
-                               cpg = atoi(*argv);
-                               if (cpg <= 0)
-                                       fatal("%s: bad cylinders/group", *argv);
-                               cpgflg++;
-                               goto next;
-
-                       case 'd':
-                               if (argc < 1)
-                                       fatal("-d: missing sectors/track");
-                               argc--, argv++;
-                               nsectors = atoi(*argv);
-                               if (nsectors <= 0)
-                                       fatal("%s: bad sectors/track", *argv);
-                               goto next;
-
-                       case 'f':
-                               if (argc < 1)
-                                       fatal("-f: missing frag size");
-                               argc--, argv++;
-                               fsize = atoi(*argv);
-                               if (fsize <= 0)
-                                       fatal("%s: bad frag size", *argv);
-                               goto next;
-
-                       case 'i':
-                               if (argc < 1)
-                                       fatal("-i: missing bytes per inode\n");
-                               argc--, argv++;
-                               density = atoi(*argv);
-                               if (density <= 0)
-                                       fatal("%s: bad bytes per inode\n",
-                                               *argv);
-                               goto next;
-
-                       case 'k':
-                               if (argc < 1)
-                                       fatal("-k: track skew");
-                               argc--, argv++;
-                               trackskew = atoi(*argv);
-                               if (trackskew < 0)
-                                       fatal("%s: bad track skew", *argv);
-                               goto next;
-
-                       case 'l':
-                               if (argc < 1)
-                                       fatal("-l: interleave");
-                               argc--, argv++;
-                               interleave = atoi(*argv);
-                               if (interleave <= 0)
-                                       fatal("%s: bad interleave", *argv);
-                               goto next;
-
-                       case 'm':
-                               if (argc < 1)
-                                       fatal("-m: missing free space %%\n");
-                               argc--, argv++;
-                               minfree = atoi(*argv);
-                               if (minfree < 0 || minfree > 99)
-                                       fatal("%s: bad free space %%\n",
-                                               *argv);
-                               goto next;
-
-                       case 'o':
-                               if (argc < 1)
-                                       fatal("-o: missing optimization preference");
-                               argc--, argv++;
-                               if (strcmp(*argv, "space") == 0)
+       struct statfs *mp;
+       int fsi, fso, len, n;
+       char *cp, *s1, *s2, *special, *opstring, buf[BUFSIZ];
+
+       if (progname = rindex(*argv, '/'))
+               ++progname;
+       else
+               progname = *argv;
+
+       if (strstr(progname, "mfs")) {
+               mfs = 1;
+               Nflag++;
+       }
+
+       opstring = mfs ?
+           "NT:a:b:c:d:e:f:i:m:o:s:" :
+           "NOS:T:a:b:c:d:e:f:i:k:l:m:n:o:p:r:s:t:u:x:";
+       while ((ch = getopt(argc, argv, opstring)) != EOF)
+               switch (ch) {
+               case 'N':
+                       Nflag = 1;
+                       break;
+               case 'O':
+                       Oflag = 1;
+                       break;
+               case 'S':
+                       if ((sectorsize = atoi(optarg)) <= 0)
+                               fatal("%s: bad sector size", optarg);
+                       break;
+#ifdef COMPAT
+               case 'T':
+                       disktype = optarg;
+                       break;
+#endif
+               case 'a':
+                       if ((maxcontig = atoi(optarg)) <= 0)
+                               fatal("%s: bad maximum contiguous blocks\n",
+                                   optarg);
+                       break;
+               case 'b':
+                       if ((bsize = atoi(optarg)) < MINBSIZE)
+                               fatal("%s: bad block size", optarg);
+                       break;
+               case 'c':
+                       if ((cpg = atoi(optarg)) <= 0)
+                               fatal("%s: bad cylinders/group", optarg);
+                       cpgflg++;
+                       break;
+               case 'd':
+                       if ((rotdelay = atoi(optarg)) < 0)
+                               fatal("%s: bad rotational delay\n", optarg);
+                       break;
+               case 'e':
+                       if ((maxbpg = atoi(optarg)) <= 0)
+               fatal("%s: bad blocks per file in a cylinder group\n",
+                                   optarg);
+                       break;
+               case 'f':
+                       if ((fsize = atoi(optarg)) <= 0)
+                               fatal("%s: bad fragment size", optarg);
+                       break;
+               case 'i':
+                       if ((density = atoi(optarg)) <= 0)
+                               fatal("%s: bad bytes per inode\n", optarg);
+                       break;
+               case 'k':
+                       if ((trackskew = atoi(optarg)) < 0)
+                               fatal("%s: bad track skew", optarg);
+                       break;
+               case 'l':
+                       if ((interleave = atoi(optarg)) <= 0)
+                               fatal("%s: bad interleave", optarg);
+                       break;
+               case 'm':
+                       if ((minfree = atoi(optarg)) < 0 || minfree > 99)
+                               fatal("%s: bad free space %%\n", optarg);
+                       break;
+               case 'n':
+                       if ((nrpos = atoi(optarg)) <= 0)
+                               fatal("%s: bad rotational layout count\n",
+                                   optarg);
+                       break;
+               case 'o':
+                       if (mfs)
+                               getmntopts(optarg, mopts, &mntflags);
+                       else {
+                               if (strcmp(optarg, "space") == 0)

                                        opt = FS_OPTSPACE;
                                        opt = FS_OPTSPACE;

-                               else if (strcmp(*argv, "time") == 0)
+                               else if (strcmp(optarg, "time") == 0)

                                        opt = FS_OPTTIME;
                                else
                                        opt = FS_OPTTIME;
                                else

-                                       fatal("%s: bad optimization preference %s",
-                                           *argv,
-                                           "(options are `space' or `time')");
-                               goto next;
-
-                       case 'p':
-                               if (argc < 1)
-                                       fatal("-p: spare sectors per track");
-                               argc--, argv++;
-                               trackspares = atoi(*argv);
-                               if (trackspares < 0)
-                                       fatal("%s: bad spare sectors per track", *argv);
-                               goto next;
-
-                       case 'r':
-                               if (argc < 1)
-                                       fatal("-r: missing revs/minute\n");
-                               argc--, argv++;
-                               rpm = atoi(*argv);
-                               if (rpm <= 0)
-                                       fatal("%s: bad revs/minute\n", *argv);
-                               goto next;
-
-                       case 's':
-                               if (argc < 1)
-                                       fatal("-s: missing file system size");
-                               argc--, argv++;
-                               fssize = atoi(*argv);
-                               if (fssize <= 0)
-                                       fatal("%s: bad file system size",
-                                               *argv);
-                               goto next;
-
-                       case 't':
-                               if (argc < 1)
-                                       fatal("-t: missing track total");
-                               argc--, argv++;
-                               ntracks = atoi(*argv);
-                               if (ntracks <= 0)
-                                       fatal("%s: bad total tracks", *argv);
-                               goto next;
-
-                       default:
-                               fatal("-%c: unknown flag", cp);
+       fatal("%s: unknown optimization preference: use `space' or `time'.");

                        }
                        }

-next:
-               argc--, argv++;
-       }
-       if (argc < 1) {
-#ifdef COMPAT
-               fprintf(stderr,
-               "usage: newfs [ fsoptions ] special-device [device-type]\n");
-#else
-               fprintf(stderr, "usage: newfs [ fsoptions ] special-device\n");
-#endif
-               fprintf(stderr, "where fsoptions are:\n");
-               fprintf(stderr, "\t-N do not create file system, %s\n",
-                       "just print out parameters");
-               fprintf(stderr, "\t-b block size\n");
-               fprintf(stderr, "\t-f frag size\n");
-               fprintf(stderr, "\t-m minimum free space %%\n");
-               fprintf(stderr, "\t-o optimization preference %s\n",
-                       "(`space' or `time')");
-               fprintf(stderr, "\t-i number of bytes per inode\n");
-               fprintf(stderr, "\t-c cylinders/group\n");
-               fprintf(stderr, "\t-s file system size (sectors)\n");
-               fprintf(stderr, "\t-r revolutions/minute\n");
-               fprintf(stderr, "\t-S sector size\n");
-               fprintf(stderr, "\t-d sectors/track\n");
-               fprintf(stderr, "\t-t tracks/cylinder\n");
-               fprintf(stderr, "\t-p spare sectors per track\n");
-               fprintf(stderr, "\t-a spare sectors per cylinder\n");
-               fprintf(stderr, "\t-l hardware sector interleave\n");
-               fprintf(stderr, "\t-k sector 0 skew, per track\n");
-               exit(1);
-       }
+                       break;
+               case 'p':
+                       if ((trackspares = atoi(optarg)) < 0)
+                               fatal("%s: bad spare sectors per track",
+                                   optarg);
+                       break;
+               case 'r':
+                       if ((rpm = atoi(optarg)) <= 0)
+                               fatal("%s: bad revolutions/minute\n", optarg);
+                       break;
+               case 's':
+                       if ((fssize = atoi(optarg)) <= 0)
+                               fatal("%s: bad file system size", optarg);
+                       break;
+               case 't':
+                       if ((ntracks = atoi(optarg)) <= 0)
+                               fatal("%s: bad total tracks", optarg);
+                       break;
+               case 'u':
+                       if ((nsectors = atoi(optarg)) <= 0)
+                               fatal("%s: bad sectors/track", optarg);
+                       break;
+               case 'x':
+                       if ((cylspares = atoi(optarg)) < 0)
+                               fatal("%s: bad spare sectors per cylinder",
+                                   optarg);
+                       break;
+               case '?':
+               default:
+                       usage();
+               }
+       argc -= optind;
+       argv += optind;
+
+       if (argc != 2 && (mfs || argc != 1))
+               usage();
+

        special = argv[0];
        cp = rindex(special, '/');
        special = argv[0];
        cp = rindex(special, '/');

-       if (cp != 0)
-               special = cp + 1;
-       if (*special == 'r' && special[1] != 'a' && special[1] != 'b')
-               special++;
-       special = sprintf(device, "/dev/r%s", special);
-       if (!Nflag) {
+       if (cp == 0) {
+               /*
+                * No path prefix; try /dev/r%s then /dev/%s.
+                */
+               (void)sprintf(device, "%sr%s", _PATH_DEV, special);
+               if (stat(device, &st) == -1)
+                       (void)sprintf(device, "%s%s", _PATH_DEV, special);
+               special = device;
+       }
+       if (Nflag) {
+               fso = -1;
+       } else {

                fso = open(special, O_WRONLY);
                fso = open(special, O_WRONLY);

-               if (fso < 0) {
-                       perror(special);
-                       exit(1);
+               if (fso < 0)
+                       fatal("%s: %s", special, strerror(errno));
+
+               /* Bail if target special is mounted */
+               n = getmntinfo(&mp, MNT_NOWAIT);
+               if (n == 0)
+                       fatal("%s: getmntinfo: %s", special, strerror(errno));
+
+               len = sizeof(_PATH_DEV) - 1;
+               s1 = special;
+               if (strncmp(_PATH_DEV, s1, len) == 0)
+                       s1 += len;
+
+               while (--n >= 0) {
+                       s2 = mp->f_mntfromname;
+                       if (strncmp(_PATH_DEV, s2, len) == 0) {
+                               s2 += len - 1;
+                               *s2 = 'r';
+                       }
+                       if (strcmp(s1, s2) == 0 || strcmp(s1, &s2[1]) == 0)
+                               fatal("%s is mounted on %s",
+                                   special, mp->f_mntonname);
+                       ++mp;

                }
                }

-       } else
-               fso = -1;
-       fsi = open(special, O_RDONLY);
-       if (fsi < 0) {
-               perror(special);
-               exit(1);
-       }
-       if (fstat(fsi, &st) < 0) {
-               fprintf(stderr, "newfs: "); perror(special);
-               exit(2);

        }
        }

-       if ((st.st_mode & S_IFMT) != S_IFCHR)
-               fatal("%s: not a character device", special);
-       cp = index(argv[0], '\0') - 1;
-       if (cp == 0 || (*cp < 'a' || *cp > 'h') && !isdigit(*cp))
-               fatal("%s: can't figure out file system partition", argv[0]);
+       if (mfs && disktype != NULL) {
+               lp = (struct disklabel *)getdiskbyname(disktype);
+               if (lp == NULL)
+                       fatal("%s: unknown disk type", disktype);
+               pp = &lp->d_partitions[1];
+       } else {
+               fsi = open(special, O_RDONLY);
+               if (fsi < 0)
+                       fatal("%s: %s", special, strerror(errno));
+               if (fstat(fsi, &st) < 0)
+                       fatal("%s: %s", special, strerror(errno));
+               if ((st.st_mode & S_IFMT) != S_IFCHR && !mfs)
+                       printf("%s: %s: not a character-special device\n",
+                           progname, special);
+               cp = index(argv[0], '\0') - 1;
+               if (cp == 0 || (*cp < 'a' || *cp > 'h') && !isdigit(*cp))
+                       fatal("%s: can't figure out file system partition",
+                           argv[0]);

 #ifdef COMPAT
 #ifdef COMPAT

-       lp = getdisklabel(special, fsi, argv[1]);
-#else
-       lp = getdisklabel(special, fsi);
+               if (!mfs && disktype == NULL)
+                       disktype = argv[1];

 #endif
 #endif

-       if (isdigit(*cp))
-               pp = &lp->d_partitions[0];
-       else
-               pp = &lp->d_partitions[*cp - 'a'];
-       if (pp->p_size == 0)
-               fatal("%s: `%c' partition is unavailable", argv[0], *cp);
+               lp = getdisklabel(special, fsi);
+               if (isdigit(*cp))
+                       pp = &lp->d_partitions[0];
+               else
+                       pp = &lp->d_partitions[*cp - 'a'];
+               if (pp->p_size == 0)
+                       fatal("%s: `%c' partition is unavailable",
+                           argv[0], *cp);
+               if (pp->p_fstype == FS_BOOT)
+                       fatal("%s: `%c' partition overlaps boot program",
+                             argv[0], *cp);
+       }

        if (fssize == 0)
                fssize = pp->p_size;
        if (fssize == 0)
                fssize = pp->p_size;

-       if (fssize > pp->p_size)
+       if (fssize > pp->p_size && !mfs)

               fatal("%s: maximum file system size on the `%c' partition is %d",
                        argv[0], *cp, pp->p_size);
        if (rpm == 0) {
               fatal("%s: maximum file system size on the `%c' partition is %d",
                        argv[0], *cp, pp->p_size);
        if (rpm == 0) {


@@ -409,9 +427,19 @@ next:
                if (bsize <= 0)
                        bsize = MIN(DFL_BLKSIZE, 8 * fsize);
        }
                if (bsize <= 0)
                        bsize = MIN(DFL_BLKSIZE, 8 * fsize);
        }

-       if (minfree < 10 && opt != FS_OPTSPACE) {
+       /*
+        * Maxcontig sets the default for the maximum number of blocks
+        * that may be allocated sequentially. With filesystem clustering
+        * it is possible to allocate contiguous blocks up to the maximum
+        * transfer size permitted by the controller or buffering.
+        */
+       if (maxcontig == 0)
+               maxcontig = MAX(1, MIN(MAXPHYS, MAXBSIZE) / bsize - 1);
+       if (density == 0)
+               density = NFPI * fsize;
+       if (minfree < MINFREE && opt != FS_OPTSPACE) {

                fprintf(stderr, "Warning: changing optimization to space ");
                fprintf(stderr, "Warning: changing optimization to space ");

-               fprintf(stderr, "because minfree is less than 10%%\n");
+               fprintf(stderr, "because minfree is less than %d%%\n", MINFREE);

                opt = FS_OPTSPACE;
        }
        if (trackspares == -1) {
                opt = FS_OPTSPACE;
        }
        if (trackspares == -1) {


@@ -427,13 +455,20 @@ next:
        }
        secpercyl = nsectors * ntracks - cylspares;
        if (secpercyl != lp->d_secpercyl)
        }
        secpercyl = nsectors * ntracks - cylspares;
        if (secpercyl != lp->d_secpercyl)

-               fprintf(stderr, "%s (%d) %s (%d)\n",
+               fprintf(stderr, "%s (%d) %s (%lu)\n",

                        "Warning: calculated sectors per cylinder", secpercyl,
                        "disagrees with disk label", lp->d_secpercyl);
                        "Warning: calculated sectors per cylinder", secpercyl,
                        "disagrees with disk label", lp->d_secpercyl);

+       if (maxbpg == 0)
+               maxbpg = MAXBLKPG(bsize);

        headswitch = lp->d_headswitch;
        trackseek = lp->d_trkseek;
        headswitch = lp->d_headswitch;
        trackseek = lp->d_trkseek;

+       /* Reno fix: label may be 0 if faked up by kernel */
+#ifdef notdef
+#ifdef notdef /* label may be 0 if faked up by kernel */

        bbsize = lp->d_bbsize;
        sbsize = lp->d_sbsize;
        bbsize = lp->d_bbsize;
        sbsize = lp->d_sbsize;

+#endif
+#endif

        oldpartition = *pp;
 #ifdef tahoe
        realsectorsize = sectorsize;
        oldpartition = *pp;
 #ifdef tahoe
        realsectorsize = sectorsize;


@@ -455,30 +490,35 @@ next:
 #endif
        if (!Nflag && bcmp(pp, &oldpartition, sizeof(oldpartition)))
                rewritelabel(special, fso, lp);
 #endif
        if (!Nflag && bcmp(pp, &oldpartition, sizeof(oldpartition)))
                rewritelabel(special, fso, lp);

+       if (!Nflag)
+               close(fso);
+       close(fsi);
+#ifdef MFS
+       if (mfs) {
+               struct mfs_args args;
+
+               sprintf(buf, "mfs:%d", getpid());
+               args.fspec = buf;
+               args.export.ex_root = -2;
+               if (mntflags & MNT_RDONLY)
+                       args.export.ex_flags = MNT_EXRDONLY;
+               else
+                       args.export.ex_flags = 0;
+               args.base = membase;
+               args.size = fssize * sectorsize;
+               if (mount(MOUNT_MFS, argv[1], mntflags, &args) < 0)
+                       fatal("%s: %s", argv[1], strerror(errno));
+       }
+#endif

        exit(0);
 }
 
 #ifdef COMPAT
        exit(0);
 }
 
 #ifdef COMPAT

-struct disklabel *
-getdisklabel(s, fd, type)
-       char *s, *type;
-       int fd;
-{
-       static struct disklabel lab;
-       struct disklabel *getdiskbyname();
-
-       if (ioctl(fd, DIOCGDINFO, (char *)&lab) < 0) {
-               if (type == NULL) {
-                       perror("ioctl (GDINFO)");
-                       fatal(
-                  "%s: can't read disk label; disk type must be specified", s);
-               }
-               unlabelled++;
-               return (getdiskbyname(type));
-       }
-       return (&lab);
-}
+char lmsg[] = "%s: can't read disk label; disk type must be specified";

 #else
 #else

+char lmsg[] = "%s: can't read disk label";
+#endif
+

 struct disklabel *
 getdisklabel(s, fd)
        char *s;
 struct disklabel *
 getdisklabel(s, fd)
        char *s;


@@ -487,27 +527,36 @@ getdisklabel(s, fd)
        static struct disklabel lab;
 
        if (ioctl(fd, DIOCGDINFO, (char *)&lab) < 0) {
        static struct disklabel lab;
 
        if (ioctl(fd, DIOCGDINFO, (char *)&lab) < 0) {

-               perror("ioctl (GDINFO)");
-               fatal("%s: can't read disk label", s);
+#ifdef COMPAT
+               if (disktype) {
+                       struct disklabel *lp, *getdiskbyname();
+
+                       unlabeled++;
+                       lp = getdiskbyname(disktype);
+                       if (lp == NULL)
+                               fatal("%s: unknown disk type", disktype);
+                       return (lp);
+               }
+#endif
+               warn("ioctl (GDINFO)");
+               fatal(lmsg, s);

        }
        return (&lab);
 }
        }
        return (&lab);
 }

-#endif

 
 rewritelabel(s, fd, lp)
        char *s;
        int fd;
        register struct disklabel *lp;
 {
 
 rewritelabel(s, fd, lp)
        char *s;
        int fd;
        register struct disklabel *lp;
 {

-

 #ifdef COMPAT
 #ifdef COMPAT

-       if (unlabelled)
+       if (unlabeled)

                return;
 #endif
        lp->d_checksum = 0;
        lp->d_checksum = dkcksum(lp);
        if (ioctl(fd, DIOCWDINFO, (char *)lp) < 0) {
                return;
 #endif
        lp->d_checksum = 0;
        lp->d_checksum = dkcksum(lp);
        if (ioctl(fd, DIOCWDINFO, (char *)lp) < 0) {

-               perror("ioctl (GWINFO)");
+               warn("ioctl (WDINFO)");

                fatal("%s: can't rewrite disk label", s);
        }
 #if vax
                fatal("%s: can't rewrite disk label", s);
        }
 #if vax


@@ -527,36 +576,93 @@ rewritelabel(s, fd, lp)
                if (!isdigit(*cp))
                        *cp = 'c';
                cfd = open(specname, O_WRONLY);
                if (!isdigit(*cp))
                        *cp = 'c';
                cfd = open(specname, O_WRONLY);

-               if (cfd < 0) {
-                       perror(specname);
-                       exit(2);
-               }
+               if (cfd < 0)
+                       fatal("%s: %s", specname, strerror(errno));

                bzero(blk, sizeof(blk));
                *(struct disklabel *)(blk + LABELOFFSET) = *lp;
                alt = lp->d_ncylinders * lp->d_secpercyl - lp->d_nsectors;
                for (i = 1; i < 11 && i < lp->d_nsectors; i += 2) {
                bzero(blk, sizeof(blk));
                *(struct disklabel *)(blk + LABELOFFSET) = *lp;
                alt = lp->d_ncylinders * lp->d_secpercyl - lp->d_nsectors;
                for (i = 1; i < 11 && i < lp->d_nsectors; i += 2) {

-                       if (lseek(cfd, (off_t)(alt + i) * lp->d_secsize, L_SET) == -1) {
-                               perror("lseek to badsector area");
-                               exit(30);
-                       }
-                       if (write(cfd, blk, lp->d_secsize) < lp->d_secsize) {
-                               int oerrno = errno;
-                               fprintf(stderr, "alternate label %d ", i/2);
-                               errno = oerrno;
-                               perror("write");
-                       }
+                       if (lseek(cfd, (off_t)(alt + i) * lp->d_secsize,
+                           L_SET) == -1)
+                               fatal("lseek to badsector area: %s",
+                                   strerror(errno));
+                       if (write(cfd, blk, lp->d_secsize) < lp->d_secsize)
+                               warn("alternate label %d write", i/2);

                }
                }

+               close(cfd);

        }
 #endif
 }
 
 /*VARARGS*/
        }
 #endif
 }
 
 /*VARARGS*/

-fatal(fmt, arg1, arg2)
+void
+#if __STDC__
+fatal(const char *fmt, ...)
+#else
+fatal(fmt, va_alist)

        char *fmt;
        char *fmt;

+       va_dcl
+#endif

 {
 {

+       va_list ap;
+
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       if (fcntl(STDERR_FILENO, F_GETFL) < 0) {
+               openlog(progname, LOG_CONS, LOG_DAEMON);
+               vsyslog(LOG_ERR, fmt, ap);
+               closelog();
+       } else {
+               vwarnx(fmt, ap);
+       }
+       va_end(ap);
+       exit(1);
+       /*NOTREACHED*/
+}

 
 

-       fprintf(stderr, "newfs: ");
-       fprintf(stderr, fmt, arg1, arg2);
-       putc('\n', stderr);
-       exit(10);
+usage()
+{
+       if (mfs) {
+               fprintf(stderr,
+                   "usage: %s [ -fsoptions ] special-device mount-point\n",
+                       progname);
+       } else
+               fprintf(stderr,
+                   "usage: %s [ -fsoptions ] special-device%s\n",
+                   progname,
+#ifdef COMPAT
+                   " [device-type]");
+#else
+                   "");
+#endif
+       fprintf(stderr, "where fsoptions are:\n");
+       fprintf(stderr,
+           "\t-N do not create file system, just print out parameters\n");
+       fprintf(stderr, "\t-O create a 4.3BSD format filesystem\n");
+       fprintf(stderr, "\t-S sector size\n");
+#ifdef COMPAT
+       fprintf(stderr, "\t-T disktype\n");
+#endif
+       fprintf(stderr, "\t-a maximum contiguous blocks\n");
+       fprintf(stderr, "\t-b block size\n");
+       fprintf(stderr, "\t-c cylinders/group\n");
+       fprintf(stderr, "\t-d rotational delay between contiguous blocks\n");
+       fprintf(stderr, "\t-e maximum blocks per file in a cylinder group\n");
+       fprintf(stderr, "\t-f frag size\n");
+       fprintf(stderr, "\t-i number of bytes per inode\n");
+       fprintf(stderr, "\t-k sector 0 skew, per track\n");
+       fprintf(stderr, "\t-l hardware sector interleave\n");
+       fprintf(stderr, "\t-m minimum free space %%\n");
+       fprintf(stderr, "\t-n number of distinguished rotational positions\n");
+       fprintf(stderr, "\t-o optimization preference (`space' or `time')\n");
+       fprintf(stderr, "\t-p spare sectors per track\n");
+       fprintf(stderr, "\t-s file system size (sectors)\n");
+       fprintf(stderr, "\t-r revolutions/minute\n");
+       fprintf(stderr, "\t-t tracks/cylinder\n");
+       fprintf(stderr, "\t-u sectors/track\n");
+       fprintf(stderr, "\t-x spare sectors per cylinder\n");
+       exit(1);

 }
 }