more file system > filesystem

4 files changed, 39 insertions, 39 deletions

diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index b0bbcb9..16e7de7 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -61,7 +61,7 @@ static const char rcsid[] =
 #include "newfs.h"
 
 /*
- * make file system for cylinder-group style file systems
+ * make filesystem for cylinder-group style filesystems
  */
 
 /*
@@ -134,7 +134,7 @@ mkfs(struct partition *pp, char *fsys)
 	if (Uflag)
 		sblock.fs_flags |= FS_DOSOFTDEP;
 	/*
-	 * Validate the given file system size.
+	 * Validate the given filesystem size.
 	 * Verify that its last block can actually be accessed.
 	 */
 	if (fssize <= 0)
@@ -384,8 +384,8 @@ mkfs(struct partition *pp, char *fsys)
 	}
 	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 filesystem and nsect and ntrak.
+	 * Determine number of cylinders and blocks in the filesystem.
 	 */
 	sblock.fs_size = fssize = dbtofsb(&sblock, fssize);
 	sblock.fs_ncyl = fssize * NSPF(&sblock) / sblock.fs_spc;
@@ -394,7 +394,7 @@ mkfs(struct partition *pp, char *fsys)
 		lwarn = 1;
 	}
 	if (sblock.fs_ncyl < 1) {
-		printf("file systems must have at least one cylinder\n");
+		printf("filesystems must have at least one cylinder\n");
 		exit(28);
 	}
 	/*
@@ -404,7 +404,7 @@ mkfs(struct partition *pp, char *fsys)
 	 * 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
+	 * size of the filesystem. 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).
 	 */
@@ -496,7 +496,7 @@ mkfs(struct partition *pp, char *fsys)
 	sblock.fs_id[1] = random();
 
 	/*
-	 * Dump out summary information about file system.
+	 * Dump out summary information about filesystem.
 	 */
 	printf("%s:\t%d sectors in %d %s of %d tracks, %d sectors\n",
 	    fsys, sblock.fs_size * NSPF(&sblock), sblock.fs_ncyl,
@@ -535,7 +535,7 @@ mkfs(struct partition *pp, char *fsys)
 	if (Nflag)
 		exit(0);
 	/*
-	 * Now construct the initial file system,
+	 * Now construct the initial filesystem,
 	 * then write out the super-block.
 	 */
 	fsinit(utime);
@@ -720,7 +720,7 @@ initcg(int cylno, time_t utime)
 }
 
 /*
- * initialize the file system
+ * initialize the filesystem
  */
 struct dinode node;
 
@@ -907,7 +907,7 @@ iput(struct dinode *ip, ino_t ino)
 }
 
 /*
- * read a block from the file system
+ * read a block from the filesystem
  */
 void
 rdfs(daddr_t bno, int size, char *bf)
@@ -953,7 +953,7 @@ wtfsflush()
 }
 
 /*
- * write a block to the file system
+ * write a block to the filesystem
  */
 static void
 wtfs(daddr_t bno, int size, char *bf)
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 80c30c3..9ca6337 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm newfs ,
-.Nd construct a new file system
+.Nd construct a new filesystem
 .Sh SYNOPSIS
 .Nm
 .Op Fl NOU
@@ -64,7 +64,7 @@ Before running
 the disk must be labeled using
 .Xr disklabel 8 .
 .Nm Newfs
-builds a file system on the specified special file.
+builds a filesystem on the specified special file.
 (We often refer to the
 .Dq special file
 as the
@@ -80,8 +80,8 @@ The following options define the general layout policies:
 .It Fl T Ar disktype
 For backward compatibility.
 .It Fl N
-Cause the file system parameters to be printed out
-without really creating the file system.
+Cause the filesystem parameters to be printed out
+without really creating the filesystem.
 .It Fl U
 Enables soft updates on the new filesystem.
 .It Fl a Ar maxcontig
@@ -92,13 +92,13 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl b Ar block-size
-The block size of the file system, in bytes.  It must be a power of 2.  The
+The block size of the filesystem, in bytes.  It must be a power of 2.  The
 default size is 16384 bytes, and the smallest allowable size is 4096 bytes.
 The optimal block:fragment ratio is 8:1.
 Other ratios are possible, but are not recommended,
 and may produce unpredictable results.
 .It Fl c Ar #cylinders/group
-The number of cylinders per cylinder group in a file system.  The default
+The number of cylinders per cylinder group in a filesystem.  The default
 is to compute the maximum allowed by the other parameters.  This value is
 dependent on a number of other parameters, in particular the block size
 and the number of bytes per inode.
@@ -111,25 +111,25 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl f Ar frag-size
-The fragment size of the file system in bytes.  It must be a power of two
+The fragment size of the filesystem in bytes.  It must be a power of two
 ranging in value between
 .Ar blocksize Ns /8
 and
 .Ar blocksize .
 The default is 2048 bytes.
 .It Fl g Ar avgfilesize
-The expected average file size for the file system.
+The expected average file size for the filesystem.
 .It Fl h Ar avgfpdir
-The expected average number of files per directory on the file system.
+The expected average number of files per directory on the filesystem.
 .It Fl i Ar number of bytes per inode
-Specify the density of inodes in the file system.
+Specify the density of inodes in the filesystem.
 The default is to create an inode for every
 .Pq 4 * Ar frag-size
 bytes of data space.
 If fewer inodes are desired, a larger number should be used;
 to create more inodes a smaller number should be given.
 One inode is required for each distinct file, so this value effectively
-specifies the average file size on the file system.
+specifies the average file size on the filesystem.
 .It Fl m Ar free space \&%
 The percentage of space reserved from normal users; the minimum free
 space threshold.
@@ -144,7 +144,7 @@ See
 for more details on how to set this option.
 .It Fl o Ar optimization\ preference
 .Pq Ar space No or Ar time .
-The file system can either be instructed to try to minimize the time spent
+The filesystem can either be instructed to try to minimize the time spent
 allocating blocks, or to try to minimize the space fragmentation on the disk.
 If the value of minfree (see above) is less than 8%,
 the default is to optimize for
@@ -156,19 +156,19 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl s Ar size
-The size of the file system in sectors.  This value defaults to the size of the
+The size of the filesystem in sectors.  This value defaults to the size of the
 raw partition specified in
 .Ar special
 (in other words,
 .Nm
-will use the entire partition for the file system).
+will use the entire partition for the filesystem).
 .El
 .Pp
 The following options override the standard sizes for the disk geometry.
 Their default values are taken from the disk label.
 Changing these defaults is useful only when using
 .Nm
-to build a file system whose raw image will eventually be used on a
+to build a filesystem whose raw image will eventually be used on a
 different type of disk than the one on which it is initially created
 (for example on a write-once disk).
 Note that changing any of these values from their defaults will make
@@ -187,7 +187,7 @@ If zero is specified, the value from the disklabel will be used.
 .Sh EXAMPLES
 .Dl newfs /dev/ad3s1a
 .Pp
-Creates a new ufs file system on
+Creates a new ufs filesystem on
 .Pa ad3s1a .
 .Nm
 will use a block size of 16384 bytes, a fragment size of 2048 bytes
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index efb4686..f6b9e71 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -99,7 +99,7 @@ static const char rcsid[] =
 #define MAXBLKPG(bsize)	((bsize) / sizeof(daddr_t))
 
 /*
- * Each file system has a number of inodes statically allocated.
+ * Each filesystem has a number of inodes statically allocated.
  * We allocate one inode slot per NFPI fragments, expecting this
  * to be far more than we will ever need.
  */
@@ -114,10 +114,10 @@ static const char rcsid[] =
  */
 #define NSECTORS	4096	/* number of sectors */
 
-int	Nflag;			/* run without writing file system */
+int	Nflag;			/* run without writing filesystem */
 int	Rflag;			/* regression test */
-int	Uflag;			/* enable soft updates for file system */
-u_int	fssize;			/* file system size */
+int	Uflag;			/* enable soft updates for filesystem */
+u_int	fssize;			/* filesystem size */
 u_int	secpercyl = NSECTORS;	/* sectors per cylinder */
 u_int	sectorsize;		/* bytes/sector */
 int	realsectorsize;		/* bytes/sector in hardware */
@@ -224,7 +224,7 @@ main(int argc, char *argv[])
 			break;
 		case 's':
 			if ((fssize = atoi(optarg)) <= 0)
-				errx(1, "%s: bad file system size", optarg);
+				errx(1, "%s: bad filesystem size", optarg);
 			break;
 		case 'u':
 			t_or_u_flag++;
@@ -275,7 +275,7 @@ main(int argc, char *argv[])
 		cp = strchr(special, '\0');
 		cp--;
 		if ((*cp < 'a' || *cp > 'h') && !isdigit(*cp))
-			errx(1, "%s: can't figure out file system partition",
+			errx(1, "%s: can't figure out filesystem partition",
 			    special);
 		if (isdigit(*cp))
 			pp = &lp->d_partitions[RAW_PART];
@@ -292,7 +292,7 @@ main(int argc, char *argv[])
 			fssize = pp->p_size;
 		if (fssize > pp->p_size)
 			errx(1, 
-		    "%s: maximum file system size %d", special, pp->p_size);
+		    "%s: maximum filesystem size %d", special, pp->p_size);
 		if (secpercyl == 0)
 			secpercyl = lp->d_nsectors;
 		if (sectorsize == 0)
@@ -398,7 +398,7 @@ usage()
 	    " [device-type]");
 	fprintf(stderr, "where fsoptions are:\n");
 	fprintf(stderr,
-	    "\t-N do not create file system, just print out parameters\n");
+	    "\t-N do not create filesystem, just print out parameters\n");
 	fprintf(stderr, "\t-R regression test, supress random factors\n");
 	fprintf(stderr, "\t-S sector size\n");
 	fprintf(stderr, "\t-T disktype\n");
@@ -413,7 +413,7 @@ usage()
 	fprintf(stderr, "\t-i number of bytes per inode\n");
 	fprintf(stderr, "\t-m minimum free space %%\n");
 	fprintf(stderr, "\t-o optimization preference (`space' or `time')\n");
-	fprintf(stderr, "\t-s file system size (sectors)\n");
+	fprintf(stderr, "\t-s filesystem size (sectors)\n");
 	fprintf(stderr, "\t-u sectors/cylinder\n");
 	fprintf(stderr,
         "\t-v do not attempt to determine partition name from device name\n");
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index a66a29d..d5fec76 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -37,10 +37,10 @@
 /*
  * variables set up by front end.
  */
-extern int	Nflag;		/* run mkfs without writing file system */
+extern int	Nflag;		/* run mkfs without writing filesystem */
 extern int	Rflag;		/* regression test */
-extern int	Uflag;		/* enable soft updates for file system */
-extern u_int	fssize;		/* file system size */
+extern int	Uflag;		/* enable soft updates for filesystem */
+extern u_int	fssize;		/* filesystem size */
 extern u_int	secpercyl;	/* sectors per cylinder */
 extern u_int	sectorsize;	/* bytes/sector */
 extern int	realsectorsize;	/* bytes/sector in hardware*/