s/filesystem/file system/g as discussed on -developers

4 files changed, 51 insertions, 51 deletions

diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 8f5167d..39575ef 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -74,7 +74,7 @@ static const char rcsid[] =
 #include "newfs.h"
 
 /*
- * make filesystem for cylinder-group style filesystems
+ * make file system for cylinder-group style file systems
  */
 #define UMASK		0755
 #define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
@@ -152,9 +152,9 @@ mkfs(struct partition *pp, char *fsys)
 	if (Uflag)
 		sblock.fs_flags |= FS_DOSOFTDEP;
 	/*
-	 * Validate the given filesystem size.
+	 * Validate the given file system size.
 	 * Verify that its last block can actually be accessed.
-	 * Convert to filesystem fragment sized units.
+	 * Convert to file system fragment sized units.
 	 */
 	if (fssize <= 0) {
 		printf("preposterous size %jd\n", (intmax_t)fssize);
@@ -163,7 +163,7 @@ mkfs(struct partition *pp, char *fsys)
 	wtfs(fssize - (realsectorsize / DEV_BSIZE), realsectorsize,
 	    (char *)&sblock);
 	/*
-	 * collect and verify the filesystem density info
+	 * collect and verify the file system density info
 	 */
 	sblock.fs_avgfilesize = avgfilesize;
 	sblock.fs_avgfpdir = avgfilesperdir;
@@ -418,7 +418,7 @@ mkfs(struct partition *pp, char *fsys)
 	}
 
 	/*
-	 * Dump out summary information about filesystem.
+	 * Dump out summary information about file system.
 	 */
 #	define B2MBFACTOR (1 / (1024.0 * 1024.0))
 	printf("%s: %.1fMB (%jd sectors) block size %d, fragment size %d\n",
@@ -462,7 +462,7 @@ mkfs(struct partition *pp, char *fsys)
 	if (Nflag)
 		exit(0);
 	/*
-	 * Now construct the initial filesystem,
+	 * Now construct the initial file system,
 	 * then write out the super-block.
 	 */
 	fsinit(utime);
@@ -650,7 +650,7 @@ initcg(int cylno, time_t utime)
 	}
 	wtfs(fsbtodb(&sblock, cgsblock(&sblock, cylno)), iobufsize, iobuf);
 	/*
-	 * For the old filesystem, we have to initialize all the inodes.
+	 * For the old file system, we have to initialize all the inodes.
 	 */
 	if (Oflag == 1) {
 		for (i = 2 * sblock.fs_frag;
@@ -668,7 +668,7 @@ initcg(int cylno, time_t utime)
 }
 
 /*
- * initialize the filesystem
+ * initialize the file system
  */
 #define PREDEFDIR 2
 
@@ -835,7 +835,7 @@ iput(union dinode *ip, ino_t ino)
 }
 
 /*
- * read a block from the filesystem
+ * read a block from the file system
  */
 void
 rdfs(ufs2_daddr_t bno, int size, char *bf)
@@ -881,7 +881,7 @@ wtfsflush()
 }
 
 /*
- * write a block to the filesystem
+ * write a block to the file system
  */
 static void
 wtfs(ufs2_daddr_t bno, int size, char *bf)
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 55d2d73..2713d56 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -37,11 +37,11 @@
 .Os
 .Sh NAME
 .Nm newfs ,
-.Nd construct a new filesystem
+.Nd construct a new file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl NU
-.Op Fl O Ar filesystem-type
+.Op Fl O Ar file system-type
 .Op Fl S Ar sector-size
 .Op Fl T Ar disktype
 .Op Fl a Ar maxcontig
@@ -60,14 +60,14 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility is used to initialize and clear filesystems before first use.
+utility is used to initialize and clear file systems before first use.
 Before running
 .Nm
 the disk must be labeled using
 .Xr disklabel 8 .
 The
 .Nm
-utility builds a filesystem on the specified special file.
+utility builds a file system on the specified special file.
 (We often refer to the
 .Dq special file
 as the
@@ -83,14 +83,14 @@ The following options define the general layout policies:
 .It Fl T Ar disktype
 For backward compatibility.
 .It Fl N
-Cause the filesystem parameters to be printed out
-without really creating the filesystem.
-.It Fl O Ar filesystem-type
-Use 1 to specify that a UFS1 format filesystem be built;
-use 2 to specify that a UFS2 format filesystem be built.
+Cause the file system parameters to be printed out
+without really creating the file system.
+.It Fl O Ar file system-type
+Use 1 to specify that a UFS1 format file system be built;
+use 2 to specify that a UFS2 format file system be built.
 The default is UFS1 format, but will eventually be changed to UFS2.
 .It Fl U
-Enables soft updates on the new filesystem.
+Enables soft updates on the new file system.
 .It Fl a Ar maxcontig
 Specify the maximum number of contiguous blocks that will be
 laid out before forcing a rotational delay.
@@ -99,7 +99,7 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl b Ar block-size
-The block size of the filesystem, in bytes.
+The block size of the file system, in bytes.
 It must be a power of 2.
 The
 default size is 16384 bytes, and the smallest allowable size is 4096 bytes.
@@ -107,16 +107,16 @@ The optimal block:fragment ratio is 8:1.
 Other ratios are possible, but are not recommended,
 and may produce poor results.
 .It Fl c Ar blocks-per-cylinder-group
-The number of blocks per cylinder group in a filesystem.
+The number of blocks per cylinder group in a file system.
 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.
 .It Fl d Ar max-extent-size
-The filesystem may choose to store large files using extents.
+The file system may choose to store large files using extents.
 This parameter specifies the largest extent size that may be used.
 It is presently limited to its default value which is 16 times
-the filesystem blocksize.
+the file system blocksize.
 .It Fl e Ar maxbpg
 Indicate the maximum number of blocks any single file can
 allocate out of a cylinder group before it is forced to begin
@@ -126,7 +126,7 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl f Ar frag-size
-The fragment size of the filesystem in bytes.
+The fragment size of the file system in bytes.
 It must be a power of two
 ranging in value between
 .Ar blocksize Ns /8
@@ -134,18 +134,18 @@ and
 .Ar blocksize .
 The default is 2048 bytes.
 .It Fl g Ar avgfilesize
-The expected average file size for the filesystem.
+The expected average file size for the file system.
 .It Fl h Ar avgfpdir
-The expected average number of files per directory on the filesystem.
+The expected average number of files per directory on the file system.
 .It Fl i Ar bytes
-Specify the density of inodes in the filesystem.
+Specify the density of inodes in the file system.
 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 filesystem.
+specifies the average file size on the file system.
 .It Fl m Ar free-space
 The percentage of space reserved from normal users; the minimum free
 space threshold.
@@ -162,7 +162,7 @@ for more details on how to set this option.
 .Cm ( space
 or
 .Cm time ) .
-The filesystem can either be instructed to try to minimize the time spent
+The file system 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
@@ -174,20 +174,20 @@ See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl s Ar size
-The size of the filesystem in sectors.
+The size of the file system 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 filesystem).
+will use the entire partition for the file system).
 .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 filesystem whose raw image will eventually be used on a
+to build a file system 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
@@ -201,7 +201,7 @@ The size of a sector in bytes (almost never anything but 512).
 .Sh EXAMPLES
 .Dl newfs /dev/ad3s1a
 .Pp
-Creates a new ufs filesystem on
+Creates a new ufs file system on
 .Pa ad3s1a .
 The
 .Nm
@@ -211,7 +211,7 @@ These values tend to produce better performance for most applications
 than the historical defaults
 (8192 byte block size and 1024 byte fragment size).
 This large fragment size may lead to much wasted space
-on filesystems that contain many small files.
+on file systems that contain many small files.
 .Sh SEE ALSO
 .Xr fdformat 1 ,
 .Xr disktab 5 ,
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 6c43a37..77d0bf8 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -98,7 +98,7 @@ static const char rcsid[] =
 /*
  * Cylinder groups may have up to MAXBLKSPERCG blocks. The actual
  * number used depends upon how much information can be stored
- * in a cylinder group map which must fit in a single filesystem
+ * in a cylinder group map which must fit in a single file system
  * block. The default is to use as many as possible blocks per group.
  */
 #define	MAXBLKSPERCG	0x7fffffff	/* desired fs_fpg ("infinity") */
@@ -111,16 +111,16 @@ static const char rcsid[] =
 #define MAXBLKPG(bsize)	((bsize) / sizeof(ufs2_daddr_t))
 
 /*
- * Each filesystem has a number of inodes statically allocated.
+ * Each file system 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.
  */
 #define	NFPI		4
 
-int	Nflag;			/* run without writing filesystem */
-int	Oflag = 1;		/* filesystem format (1 => UFS1, 2 => UFS2) */
+int	Nflag;			/* run without writing file system */
+int	Oflag = 1;		/* file system format (1 => UFS1, 2 => UFS2) */
 int	Rflag;			/* regression test */
-int	Uflag;			/* enable soft updates for filesystem */
+int	Uflag;			/* enable soft updates for file system */
 quad_t	fssize;			/* file system size */
 int	sectorsize;		/* bytes/sector */
 int	realsectorsize;		/* bytes/sector in hardware */
@@ -164,7 +164,7 @@ main(int argc, char *argv[])
 			break;
 		case 'O':
 			if ((Oflag = atoi(optarg)) < 1 || Oflag > 2)
-				errx(1, "%s: bad filesystem format value",
+				errx(1, "%s: bad file system format value",
 				    optarg);
 			break;
 		case 'R':
@@ -235,7 +235,7 @@ main(int argc, char *argv[])
 			break;
 		case 's':
 			if ((fssize = atoi(optarg)) <= 0)
-				errx(1, "%s: bad filesystem size", optarg);
+				errx(1, "%s: bad file system size", optarg);
 			break;
 		case '?':
 		default:
@@ -271,7 +271,7 @@ main(int argc, char *argv[])
 		if (fssize == 0)
 			fssize = mediasize / sectorsize;
 		else if (fssize > mediasize / sectorsize)
-			errx(1, "%s: maximum filesystem size is %u",
+			errx(1, "%s: maximum file system size is %u",
 			    special, (u_int)(mediasize / sectorsize));
 	}
 	pp = NULL;
@@ -280,7 +280,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 filesystem partition",
+			errx(1, "%s: can't figure out file system partition",
 			    special);
 		if (isdigit(*cp))
 			pp = &lp->d_partitions[RAW_PART];
@@ -297,7 +297,7 @@ main(int argc, char *argv[])
 			fssize = pp->p_size;
 		if (fssize > pp->p_size)
 			errx(1, 
-		    "%s: maximum filesystem size %d", special, pp->p_size);
+		    "%s: maximum file system size %d", special, pp->p_size);
 		if (sectorsize == 0)
 			sectorsize = lp->d_secsize;
 		if (fsize == 0)
@@ -315,7 +315,7 @@ main(int argc, char *argv[])
 		maxbsize = bsize;
 	/*
 	 * Maxcontig sets the default for the maximum number of blocks
-	 * that may be allocated sequentially. With filesystem clustering
+	 * that may be allocated sequentially. With file system clustering
 	 * it is possible to allocate contiguous blocks up to the maximum
 	 * transfer size permitted by the controller or buffering.
 	 */
@@ -389,8 +389,8 @@ usage()
 	    " [device-type]");
 	fprintf(stderr, "where fsoptions are:\n");
 	fprintf(stderr,
-	    "\t-N do not create filesystem, just print out parameters\n");
-	fprintf(stderr, "\t-O filesystem format: 1 => UFS1, 2 => UFS2\n");
+	    "\t-N do not create file system, just print out parameters\n");
+	fprintf(stderr, "\t-O file system format: 1 => UFS1, 2 => UFS2\n");
 	fprintf(stderr, "\t-R regression test, supress random factors\n");
 	fprintf(stderr, "\t-S sector size\n");
 	fprintf(stderr, "\t-T disktype\n");
diff --git a/sbin/newfs/newfs.h b/sbin/newfs/newfs.h
index 636c112..fb32a62 100644
--- a/sbin/newfs/newfs.h
+++ b/sbin/newfs/newfs.h
@@ -49,10 +49,10 @@
 /*
  * variables set up by front end.
  */
-extern int	Nflag;		/* run mkfs without writing filesystem */
-extern int	Oflag;		/* build UFS1 format filesystem */
+extern int	Nflag;		/* run mkfs without writing file system */
+extern int	Oflag;		/* build UFS1 format file system */
 extern int	Rflag;		/* regression test */
-extern int	Uflag;		/* enable soft updates for filesystem */
+extern int	Uflag;		/* enable soft updates for file system */
 extern quad_t	fssize;		/* file system size */
 extern int	sectorsize;	/* bytes/sector */
 extern int	realsectorsize;	/* bytes/sector in hardware*/