More s/file system/filesystem/g

28 files changed, 63 insertions, 61 deletions

diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index da927e1..5c7805e 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -56,7 +56,7 @@
 /*
  * Convert a component of a pathname into a pointer to a locked inode.
  * This is a very central and rather complicated routine.
- * If the file system is not maintained in a strict tree hierarchy,
+ * If the filesystem is not maintained in a strict tree hierarchy,
  * this can result in a deadlock situation (see comments in code below).
  *
  * The flag argument is LOOKUP, CREATE, RENAME, or DELETE depending on
@@ -95,7 +95,7 @@ cd9660_lookup(ap)
 {
 	register struct vnode *vdp;	/* vnode for directory being searched */
 	register struct iso_node *dp;	/* inode for directory being searched */
-	register struct iso_mnt *imp;	/* file system that directory is in */
+	register struct iso_mnt *imp;	/* filesystem that directory is in */
 	struct buf *bp;			/* a buffer of directory entries */
 	struct iso_directory_record *ep = 0;/* the current directory entry */
 	int entryoffsetinblock;		/* offset of ep in bp's buffer */
@@ -342,7 +342,7 @@ found:
 	 * infrequently since we cannot avoid this race condition without
 	 * implementing a sophisticated deadlock detection algorithm.
 	 * Note also that this simple deadlock detection scheme will not
-	 * work if the file system has any hard links other than ".."
+	 * work if the filesystem has any hard links other than ".."
 	 * that point backwards in the directory structure.
 	 */
 	pdp = vdp;
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 70ecb01..53715e7 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -587,7 +587,7 @@ cd9660_root(mp, vpp)
 }
 
 /*
- * Get file system statistics.
+ * Get filesystem statistics.
  */
 int
 cd9660_statfs(mp, sbp, td)
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 52909b1..7dcf1a9 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -137,7 +137,7 @@ cd9660_access(ap)
 	/*
 	 * Disallow write attempts unless the file is a socket,
 	 * fifo, or a block or character device resident on the
-	 * file system.
+	 * filesystem.
 	 */
 	if (mode & VWRITE) {
 		switch (vp->v_type) {
diff --git a/sys/fs/coda/README b/sys/fs/coda/README
index f9bf3c3..19de799 100644
--- a/sys/fs/coda/README
+++ b/sys/fs/coda/README
@@ -1,12 +1,14 @@
+$FreeBSD$
+
                 Announcing the Availability of the
                         Coda Distributed
                            Filesystem
                               for
                          BSD Unix Systems
 
-        Coda is a distributed file system like NFS and AFS.  It is
+        Coda is a distributed filesystem like NFS and AFS.  It is
 freely available, like NFS.  But it functions much like AFS in being a
-"stateful" file system.  Coda and AFS cache files on your local
+"stateful" filesystem.  Coda and AFS cache files on your local
 machine to improve performance.  But Coda goes a step further than AFS
 by letting you access the cached files when there is no available
 network, viz. disconnected laptops and network outages.  In Coda, both
@@ -25,12 +27,12 @@ progress and does have bugs.  It is, though, very usable.  Our
 interest is in making Coda available to as many people as possible and
 to have Coda evolve and flourish.
 
-The bulk of the Coda file system code supports the Coda client
+The bulk of the Coda filesystem code supports the Coda client
 program, the Coda server program and the utilities needed by both.
 All these programs are unix programs and can run equally well on any
 Unix platform.  Our main development thrust is improving these
 programs.  There is a small part of Coda that deals with the kernel to
-file system interface.  This code is OS specific (but should not be
+filesystem interface.  This code is OS specific (but should not be
 platform specific).
 
 Coda is currently available for several OS's and platforms:
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index c1f8391..962d329 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -40,7 +40,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon University.
+ * This code was written for the Coda filesystem at Carnegie Mellon University.
  * Contributers include David Steere, James Kistler, and M. Satyanarayanan.
  */
 
@@ -147,7 +147,7 @@ struct coda_clstat {
 extern struct coda_clstat coda_clstat;
 
 /*
- * CODA structure to hold mount/file system information
+ * CODA structure to hold mount/filesystem information
  */
 struct coda_mntinfo {
     struct vnode	*mi_rootvp;
diff --git a/sys/fs/coda/coda_io.h b/sys/fs/coda/coda_io.h
index 6620f4f..4daede1 100644
--- a/sys/fs/coda/coda_io.h
+++ b/sys/fs/coda/coda_io.h
@@ -40,7 +40,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon University.
+ * This code was written for the Coda filesystem at Carnegie Mellon University.
  * Contributers include David Steere, James Kistler, and M. Satyanarayanan.
  */
 
diff --git a/sys/fs/coda/coda_namecache.c b/sys/fs/coda/coda_namecache.c
index 29da91a..97e5b2e 100644
--- a/sys/fs/coda/coda_namecache.c
+++ b/sys/fs/coda/coda_namecache.c
@@ -40,7 +40,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon University.
+ * This code was written for the Coda filesystem at Carnegie Mellon University.
  * Contributers include David Steere, James Kistler, and M. Satyanarayanan.
  */
 
diff --git a/sys/fs/coda/coda_namecache.h b/sys/fs/coda/coda_namecache.h
index 11f2e80..2211adf 100644
--- a/sys/fs/coda/coda_namecache.h
+++ b/sys/fs/coda/coda_namecache.h
@@ -40,7 +40,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon University.
+ * This code was written for the Coda filesystem at Carnegie Mellon University.
  * Contributers include David Steere, James Kistler, and M. Satyanarayanan.
  */
 
diff --git a/sys/fs/coda/coda_pioctl.h b/sys/fs/coda/coda_pioctl.h
index 2c2577c..a76c653 100644
--- a/sys/fs/coda/coda_pioctl.h
+++ b/sys/fs/coda/coda_pioctl.h
@@ -41,7 +41,7 @@
  */
 
 /*
- * ITC Remote file system - vice ioctl interface module
+ * ITC Remote filesystem - vice ioctl interface module
  */
 
 /*
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index 8ed4f22..392012b 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -39,7 +39,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon
+ * This code was written for the Coda filesystem at Carnegie Mellon
  * University.  Contributers include David Steere, James Kistler, and
  * M. Satyanarayanan.  */
 
diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c
index 7a3b3e0..571f9ca 100644
--- a/sys/fs/coda/coda_subr.c
+++ b/sys/fs/coda/coda_subr.c
@@ -39,7 +39,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon
+ * This code was written for the Coda filesystem at Carnegie Mellon
  * University.  Contributers include David Steere, James Kistler, and
  * M. Satyanarayanan.
  */
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index e868651..33597d6 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -39,7 +39,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon
+ * This code was written for the Coda filesystem at Carnegie Mellon
  * University.  Contributers include David Steere, James Kistler, and
  * M. Satyanarayanan.  
  */
@@ -371,7 +371,7 @@ coda_root(vfsp, vpp)
 }
 
 /*
- * Get file system statistics.
+ * Get filesystem statistics.
  */
 int
 coda_nb_statfs(vfsp, sbp, td)
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index 3cb9d26..719aed9 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -40,7 +40,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon
+ * This code was written for the Coda filesystem at Carnegie Mellon
  * University.  Contributers include David Steere, James Kistler, and
  * M. Satyanarayanan.  
  */
@@ -950,7 +950,7 @@ coda_inactive(v)
 }
 
 /*
- * Remote file system operations having to do with directory manipulation.
+ * Remote filesystem operations having to do with directory manipulation.
  */
 
 /* 
@@ -1681,7 +1681,7 @@ printf("coda_readdir: Internally Opening %p\n", vp);
 }
 
 /*
- * Convert from file system blocks to device blocks
+ * Convert from filesystem blocks to device blocks
  */
 int
 coda_bmap(v)
diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h
index 29f17cf..2645ba4 100644
--- a/sys/fs/coda/coda_vnops.h
+++ b/sys/fs/coda/coda_vnops.h
@@ -40,7 +40,7 @@
  */
 
 /*
- * This code was written for the Coda file system at Carnegie Mellon
+ * This code was written for the Coda filesystem at Carnegie Mellon
  * University.  Contributers include David Steere, James Kistler, and
  * M. Satyanarayanan.  
  */
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 7550842..f5340d4 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -104,7 +104,7 @@ hpfs_mount (
 	dprintf(("hpfs_mount():\n"));
 	/*
 	 ***
-	 * Mounting non-root file system or updating a file system
+	 * Mounting non-root filesystem or updating a filesystem
 	 ***
 	 */
 
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 748e615..827b297 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -726,9 +726,9 @@ hpfs_access(ap)
 	dprintf(("hpfs_access(0x%x):\n", hp->h_no));
 
 	/*
-	 * Disallow write attempts on read-only file systems;
+	 * Disallow write attempts on read-only filesystems;
 	 * unless the file is a socket, fifo, or a block or
-	 * character device resident on the file system.
+	 * character device resident on the filesystem.
 	 */
 	if (mode & VWRITE) {
 		switch ((int)vp->v_type) {
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index e4c0bb8..c1b8a9d 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -128,9 +128,9 @@ fatblock(pmp, ofs, bnp, sizep, bop)
  * dep	  - address of denode representing the file of interest
  * findcn - file relative cluster whose filesystem relative cluster number
  *	    and/or block number are/is to be found
- * bnp	  - address of where to place the file system relative block number.
+ * bnp	  - address of where to place the filesystem relative block number.
  *	    If this pointer is null then don't return this quantity.
- * cnp	  - address of where to place the file system relative cluster number.
+ * cnp	  - address of where to place the filesystem relative cluster number.
  *	    If this pointer is null then don't return this quantity.
  *
  * NOTE: Either bnp or cnp must be non-null.
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 3f0bb76..79b0589 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -511,7 +511,7 @@ foundroot:
 	 * infrequently since we cannot avoid this race condition without
 	 * implementing a sophisticated deadlock detection algorithm.
 	 * Note also that this simple deadlock detection scheme will not
-	 * work if the file system has any hard links other than ".."
+	 * work if the filesystem has any hard links other than ".."
 	 * that point backwards in the directory structure.
 	 */
 	pdp = vdp;
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 1f35f53..0a5cc48 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -246,9 +246,9 @@ msdosfs_access(ap)
 	file_mode &= pmp->pm_mask;
 
 	/*
-	 * Disallow write attempts on read-only file systems;
+	 * Disallow write attempts on read-only filesystems;
 	 * unless the file is a socket, fifo, or a block or
-	 * character device resident on the file system.
+	 * character device resident on the filesystem.
 	 */
 	if (mode & VWRITE) {
 		switch (vp->v_type) {
@@ -388,7 +388,7 @@ msdosfs_setattr(ap)
 		 * users to attempt to set SF_SETTABLE bits or anyone to
 		 * set unsupported bits.  However, we ignore attempts to
 		 * set ATTR_ARCHIVE for directories `cp -pr' from a more
-		 * sensible file system attempts it a lot.
+		 * sensible filesystem attempts it a lot.
 		 */
 		if (suser_cred(cred, PRISON_ROOT)) {
 			if (vap->va_flags & SF_SETTABLE)
@@ -425,9 +425,9 @@ msdosfs_setattr(ap)
 
 	if (vap->va_size != VNOVAL) {
 		/*
-		 * Disallow write attempts on read-only file systems;
+		 * Disallow write attempts on read-only filesystems;
 		 * unless the file is a socket, fifo, or a block or
-		 * character device resident on the file system.
+		 * character device resident on the filesystem.
 		 */
 		switch (vp->v_type) {
 		case VDIR:
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 8099dee..a3bb34f 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -58,7 +58,7 @@ MALLOC_DECLARE(M_MSDOSFSMNT);
 #endif
 
 /*
- * Layout of the mount control block for a msdos file system.
+ * Layout of the mount control block for a msdos filesystem.
  */
 struct msdosfsmount {
 	struct mount *pm_mountp;/* vfs mount struct for this fs */
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 5eaa02f..82e1158 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -114,7 +114,7 @@ ntfs_mount (
 	if( path == NULL) {
 		/*
 		 ***
-		 * Mounting root file system
+		 * Mounting root filesystem
 		 ***
 		 */
 	
@@ -141,7 +141,7 @@ ntfs_mount (
 
 	/*
 	 ***
-	 * Mounting non-root file system or updating a file system
+	 * Mounting non-root filesystem or updating a filesystem
 	 ***
 	 */
 
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index f9e09e8..52e24c6 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -370,9 +370,9 @@ ntfs_access(ap)
 	dprintf(("ntfs_access: %d\n",ip->i_number));
 
 	/*
-	 * Disallow write attempts on read-only file systems;
+	 * Disallow write attempts on read-only filesystems;
 	 * unless the file is a socket, fifo, or a block or
-	 * character device resident on the file system.
+	 * character device resident on the filesystem.
 	 */
 	if (mode & VWRITE) {
 		switch ((int)vp->v_type) {
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index ad62bf9..f22e870 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -48,19 +48,19 @@
  *
  * (See mount_nullfs(8) for more information.)
  *
- * The null layer duplicates a portion of the file system
+ * The null layer duplicates a portion of the filesystem
  * name space under a new name.  In this respect, it is
- * similar to the loopback file system.  It differs from
+ * similar to the loopback filesystem.  It differs from
  * the loopback fs in two respects:  it is implemented using
  * a stackable layers techniques, and its "null-node"s stack above
  * all lower-layer vnodes, not just over directory vnodes.
  *
  * The null layer has two purposes.  First, it serves as a demonstration
  * of layering by proving a layer which does nothing.  (It actually
- * does everything the loopback file system does, which is slightly
+ * does everything the loopback filesystem does, which is slightly
  * more than nothing.)  Second, the null layer can serve as a prototype
  * layer.  Since it provides all necessary layer framework,
- * new file system layers can be created very easily be starting
+ * new filesystem layers can be created very easily be starting
  * with a null layer.
  *
  * The remainder of this man page examines the null layer as a basis
@@ -79,7 +79,7 @@
  *
  * OPERATION OF A NULL LAYER
  *
- * The null layer is the minimum file system layer,
+ * The null layer is the minimum filesystem layer,
  * simply bypassing all possible operations to the lower layer
  * for processing there.  The majority of its activity centers
  * on the bypass routine, through which nearly all vnode operations
@@ -141,7 +141,7 @@
  *
  * CREATING OTHER FILE SYSTEM LAYERS
  *
- * One of the easiest ways to construct new file system layers is to make
+ * One of the easiest ways to construct new filesystem layers is to make
  * a copy of the null layer, rename all files and variables, and
  * then begin modifing the copy.  Sed can be used to easily rename
  * all variables.
@@ -494,7 +494,7 @@ null_access(ap)
 	/*
 	 * Disallow write attempts on read-only layers;
 	 * unless the file is a socket, fifo, or a block or
-	 * character device resident on the file system.
+	 * character device resident on the filesystem.
 	 */
 	if (mode & VWRITE) {
 		switch (vp->v_type) {
diff --git a/sys/fs/nwfs/nwfs_mount.h b/sys/fs/nwfs/nwfs_mount.h
index 23274a7..dd445d9 100644
--- a/sys/fs/nwfs/nwfs_mount.h
+++ b/sys/fs/nwfs/nwfs_mount.h
@@ -55,7 +55,7 @@
 #define	NWFS_VOLNAME_LEN	48
 
 
-/* Layout of the mount control block for a netware file system. */
+/* Layout of the mount control block for a netware filesystem. */
 struct nwfs_args {
 	int		connRef;		/* connection reference */
 	char		mount_point[MAXPATHLEN];
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index 490f861..dc7d634 100644
--- a/sys/fs/nwfs/nwfs_vfsops.c
+++ b/sys/fs/nwfs/nwfs_vfsops.c
@@ -63,7 +63,7 @@ int nwfs_debuglevel = 0;
 static int nwfs_version = NWFS_VERSION;
 
 SYSCTL_DECL(_vfs_nwfs);
-SYSCTL_NODE(_vfs, OID_AUTO, nwfs, CTLFLAG_RW, 0, "Netware file system");
+SYSCTL_NODE(_vfs, OID_AUTO, nwfs, CTLFLAG_RW, 0, "Netware filesystem");
 SYSCTL_INT(_vfs_nwfs, OID_AUTO, version, CTLFLAG_RD, &nwfs_version, 0, "");
 SYSCTL_INT(_vfs_nwfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nwfs_debuglevel, 0, "");
 
@@ -435,23 +435,23 @@ nwfs_statfs(mp, sbp, td)
 	if (error) return error;
 	secsize = 512;			/* XXX how to get real value ??? */
 	sbp->f_spare2=0;		/* placeholder */
-	/* fundamental file system block size */
+	/* fundamental filesystem block size */
 	sbp->f_bsize = vi.sectors_per_block*secsize;
 	/* optimal transfer block size */
 	sbp->f_iosize = NWFSTOCONN(nmp)->buffer_size;
-	/* total data blocks in file system */
+	/* total data blocks in filesystem */
 	sbp->f_blocks= vi.total_blocks;
 	/* free blocks in fs */
 	sbp->f_bfree = vi.free_blocks + vi.purgeable_blocks;
 	/* free blocks avail to non-superuser */
 	sbp->f_bavail= vi.free_blocks+vi.purgeable_blocks;
-	/* total file nodes in file system */
+	/* total file nodes in filesystem */
 	sbp->f_files = vi.total_dir_entries;
 	/* free file nodes in fs */
 	sbp->f_ffree = vi.available_dir_entries;
 	sbp->f_flags = 0;		/* copy of mount exported flags */
 	if (sbp != &mp->mnt_stat) {
-		sbp->f_fsid = mp->mnt_stat.f_fsid;	/* file system id */
+		sbp->f_fsid = mp->mnt_stat.f_fsid;	/* filesystem id */
 		sbp->f_owner = mp->mnt_stat.f_owner;	/* user that mounted the filesystem */
 		sbp->f_type = mp->mnt_vfc->vfc_typenum;	/* type of filesystem */
 		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
diff --git a/sys/fs/smbfs/smbfs.h b/sys/fs/smbfs/smbfs.h
index 3078ae5..90dc8f0 100644
--- a/sys/fs/smbfs/smbfs.h
+++ b/sys/fs/smbfs/smbfs.h
@@ -49,7 +49,7 @@
 #define	SMBFS_MAXPATHCOMP	256	/* maximum number of path components */
 
 
-/* Layout of the mount control block for a netware file system. */
+/* Layout of the mount control block for a netware filesystem. */
 struct smbfs_args {
 	int		version;
 	int		dev;
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index db08f5e..6610ecf 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -170,11 +170,11 @@ smbfs_smb_statfs2(struct smb_share *ssp, struct statfs *sbp,
 	md_get_uint32le(mdp, &units);
 	md_get_uint32le(mdp, &funits);
 	md_get_uint16le(mdp, &bsize);
-	sbp->f_bsize = bpu * bsize;	/* fundamental file system block size */
-	sbp->f_blocks= units;		/* total data blocks in file system */
+	sbp->f_bsize = bpu * bsize;	/* fundamental filesystem block size */
+	sbp->f_blocks= units;		/* total data blocks in filesystem */
 	sbp->f_bfree = funits;		/* free blocks in fs */
 	sbp->f_bavail= funits;		/* free blocks avail to non-superuser */
-	sbp->f_files = 0xffff;		/* total file nodes in file system */
+	sbp->f_files = 0xffff;		/* total file nodes in filesystem */
 	sbp->f_ffree = 0xffff;		/* free file nodes in fs */
 	smb_t2_done(t2p);
 	return 0;
@@ -206,11 +206,11 @@ smbfs_smb_statfs(struct smb_share *ssp, struct statfs *sbp,
 	md_get_uint16le(mdp, &bpu);
 	md_get_uint16le(mdp, &bsize);
 	md_get_uint16le(mdp, &funits);
-	sbp->f_bsize = bpu * bsize;	/* fundamental file system block size */
-	sbp->f_blocks= units;		/* total data blocks in file system */
+	sbp->f_bsize = bpu * bsize;	/* fundamental filesystem block size */
+	sbp->f_blocks= units;		/* total data blocks in filesystem */
 	sbp->f_bfree = funits;		/* free blocks in fs */
 	sbp->f_bavail= funits;		/* free blocks avail to non-superuser */
-	sbp->f_files = 0xffff;		/* total file nodes in file system */
+	sbp->f_files = 0xffff;		/* total file nodes in filesystem */
 	sbp->f_ffree = 0xffff;		/* free file nodes in fs */
 	smb_rq_done(rqp);
 	return 0;
diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c
index f1324a1..5edff3f 100644
--- a/sys/fs/smbfs/smbfs_vfsops.c
+++ b/sys/fs/smbfs/smbfs_vfsops.c
@@ -70,7 +70,7 @@ static int smbfs_version = SMBFS_VERSION;
 vm_zone_t smbfsmount_zone;
 #endif
 
-SYSCTL_NODE(_vfs, OID_AUTO, smbfs, CTLFLAG_RW, 0, "SMB/CIFS file system");
+SYSCTL_NODE(_vfs, OID_AUTO, smbfs, CTLFLAG_RW, 0, "SMB/CIFS filesystem");
 SYSCTL_INT(_vfs_smbfs, OID_AUTO, version, CTLFLAG_RD, &smbfs_version, 0, "");
 SYSCTL_INT(_vfs_smbfs, OID_AUTO, debuglevel, CTLFLAG_RW, &smbfs_debuglevel, 0, "");
 
@@ -389,7 +389,7 @@ smbfs_statfs(struct mount *mp, struct statfs *sbp, struct thread *td)
 		return error;
 	sbp->f_flags = 0;		/* copy of mount exported flags */
 	if (sbp != &mp->mnt_stat) {
-		sbp->f_fsid = mp->mnt_stat.f_fsid;	/* file system id */
+		sbp->f_fsid = mp->mnt_stat.f_fsid;	/* filesystem id */
 		sbp->f_owner = mp->mnt_stat.f_owner;	/* user that mounted the filesystem */
 		sbp->f_type = mp->mnt_vfc->vfc_typenum;	/* type of filesystem */
 		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);