More s/file system/filesystem/g

11 files changed, 32 insertions, 32 deletions

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 20477ffc527c..d5c565680605 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -413,7 +413,7 @@ proc0_post(void *dummy __unused)
 
 	/*
 	 * Now we can look at the time, having had a chance to verify the
-	 * time from the file system.  Pretend that proc0 started now.
+	 * time from the filesystem.  Pretend that proc0 started now.
 	 */
 	sx_slock(&allproc_lock);
 	LIST_FOREACH(p, &allproc, p_list) {
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 7e033a28c8b7..662619784a4a 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -302,7 +302,7 @@ encode_comp_t(s, us)
 }
 
 /*
- * Periodically check the file system to see if accounting
+ * Periodically check the filesystem to see if accounting
  * should be turned on or off.  Beware the case where the vnode
  * has been vgone()'d out from underneath us, e.g. when the file
  * system containing the accounting file has been forcibly unmounted.
diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c
index 55ab33efbabd..72769db62a59 100644
--- a/sys/kern/kern_acl.c
+++ b/sys/kern/kern_acl.c
@@ -362,7 +362,7 @@ error:
 }
 
 /*
- * For the purposes of file systems maintaining the _OBJ entries in an
+ * For the purposes of filesystems maintaining the _OBJ entries in an
  * inode with a mode_t field, this routine converts a mode_t entry
  * to an acl_perm_t.
  */
@@ -471,7 +471,7 @@ acl_posix1e_perms_to_mode(struct acl_entry *acl_user_obj_entry,
 
 /*
  * Perform a syntactic check of the ACL, sufficient to allow an
- * implementing file system to determine if it should accept this and
+ * implementing filesystem to determine if it should accept this and
  * rely on the POSIX.1e ACL properties.
  */
 int
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index e03c09f1a44c..15837d304e8d 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1402,7 +1402,7 @@ fdfree(td)
  *
  * This is a gross hack to plug the hole.  A better solution would involve
  * a special vop or other form of generalized access control mechanism.  We
- * go ahead and just reject all procfs file systems accesses as dangerous.
+ * go ahead and just reject all procfs filesystems accesses as dangerous.
  *
  * Since setugidsafety calls this only for fd 0, 1 and 2, this check is
  * sufficient.  We also don't for check setugidness since we know we are.
diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c
index 55ab33efbabd..72769db62a59 100644
--- a/sys/kern/subr_acl_posix1e.c
+++ b/sys/kern/subr_acl_posix1e.c
@@ -362,7 +362,7 @@ error:
 }
 
 /*
- * For the purposes of file systems maintaining the _OBJ entries in an
+ * For the purposes of filesystems maintaining the _OBJ entries in an
  * inode with a mode_t field, this routine converts a mode_t entry
  * to an acl_perm_t.
  */
@@ -471,7 +471,7 @@ acl_posix1e_perms_to_mode(struct acl_entry *acl_user_obj_entry,
 
 /*
  * Perform a syntactic check of the ACL, sufficient to allow an
- * implementing file system to determine if it should accept this and
+ * implementing filesystem to determine if it should accept this and
  * rely on the POSIX.1e ACL properties.
  */
 int
diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c
index 55ab33efbabd..72769db62a59 100644
--- a/sys/kern/vfs_acl.c
+++ b/sys/kern/vfs_acl.c
@@ -362,7 +362,7 @@ error:
 }
 
 /*
- * For the purposes of file systems maintaining the _OBJ entries in an
+ * For the purposes of filesystems maintaining the _OBJ entries in an
  * inode with a mode_t field, this routine converts a mode_t entry
  * to an acl_perm_t.
  */
@@ -471,7 +471,7 @@ acl_posix1e_perms_to_mode(struct acl_entry *acl_user_obj_entry,
 
 /*
  * Perform a syntactic check of the ACL, sufficient to allow an
- * implementing file system to determine if it should accept this and
+ * implementing filesystem to determine if it should accept this and
  * rely on the POSIX.1e ACL properties.
  */
 int
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 44dec6d4d845..5cbef87fd206 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -1025,7 +1025,7 @@ checkdirs(olddp, newdp)
 }
 
 /*
- * Unmount a file system.
+ * Unmount a filesystem.
  *
  * Note: unmount takes a path to the vnode mounted on as argument,
  * not special file (as before).
@@ -1071,7 +1071,7 @@ unmount(td, uap)
 	}
 
 	/*
-	 * Don't allow unmounting the root file system.
+	 * Don't allow unmounting the root filesystem.
 	 */
 	if (mp->mnt_flag & MNT_ROOTFS) {
 		vput(vp);
@@ -1090,7 +1090,7 @@ unmount(td, uap)
 }
 
 /*
- * Do the actual file system unmount.
+ * Do the actual filesystem unmount.
  */
 int
 dounmount(mp, flags, td)
@@ -3810,7 +3810,7 @@ out:
 
 #ifdef COMPAT_43
 /*
- * Read a block of directory entries in a file system independent format.
+ * Read a block of directory entries in a filesystem independent format.
  */
 #ifndef _SYS_SYSPROTO_H_
 struct ogetdirentries_args {
@@ -3950,7 +3950,7 @@ unionread:
 #endif /* COMPAT_43 */
 
 /*
- * Read a block of directory entries in a file system independent format.
+ * Read a block of directory entries in a filesystem independent format.
  */
 #ifndef _SYS_SYSPROTO_H_
 struct getdirentries_args {
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 6c86c2a8da96..f294aa0de5a9 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -369,7 +369,7 @@ vfs_rm_vnodeops(const void *data)
 struct vattr va_null;
 
 /*
- * Initialize the vnode structures and initialize each file system type.
+ * Initialize the vnode structures and initialize each filesystem type.
  */
 /* ARGSUSED*/
 static void
@@ -380,7 +380,7 @@ vfsinit(void *dummy)
 }
 SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vfsinit, NULL)
 
-/* Register a new file system type in the global table */
+/* Register a new filesystem type in the global table */
 int
 vfs_register(struct vfsconf *vfc)
 {
@@ -426,7 +426,7 @@ vfs_register(struct vfsconf *vfc)
 }
 
 
-/* Remove registration of a file system type */
+/* Remove registration of a filesystem type */
 int
 vfs_unregister(struct vfsconf *vfc)
 {
@@ -463,7 +463,7 @@ vfs_unregister(struct vfsconf *vfc)
 }
 
 /*
- * Standard kernel module handling code for file system modules.
+ * Standard kernel module handling code for filesystem modules.
  * Referenced from VFS_SET().
  */
 int
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index f2d284ccb0ef..bb589831e139 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -411,7 +411,7 @@ dirloop:
 	 * 2. If this vnode is the root of a mounted
 	 *    filesystem, then replace it with the
 	 *    vnode which was mounted on so we take the
-	 *    .. in the other file system.
+	 *    .. in the other filesystem.
 	 * 3. If the vnode is the top directory of
 	 *    the jail or chroot, don't let them out.
 	 */
@@ -514,7 +514,7 @@ unionlookup:
 
 	/*
 	 * Check to see if the vnode has been mounted on;
-	 * if so find the root of the mounted file system.
+	 * if so find the root of the mounted filesystem.
 	 */
 	while (dp->v_type == VDIR && (mp = dp->v_mountedhere) &&
 	       (cnp->cn_flags & NOCROSSMOUNT) == 0) {
@@ -576,7 +576,7 @@ nextname:
 		goto dirloop;
 	}
 	/*
-	 * Disallow directory write attempts on read-only file systems.
+	 * Disallow directory write attempts on read-only filesystems.
 	 */
 	if (rdonly &&
 	    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) {
@@ -718,7 +718,7 @@ relookup(dvp, vpp, cnp)
 	    ("relookup: symlink found.\n"));
 
 	/*
-	 * Disallow directory write attempts on read-only file systems.
+	 * Disallow directory write attempts on read-only filesystems.
 	 */
 	if (rdonly &&
 	    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) {
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index bb92a8c0f68a..4a34e3e53219 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -650,7 +650,7 @@ vlrureclaim(struct mount *mp, int count)
 
 /*
  * Attempt to recycle vnodes in a context that is always safe to block.
- * Calling vlrurecycle() from the bowels of file system code has some
+ * Calling vlrurecycle() from the bowels of filesystem code has some
  * interesting deadlock problems.
  */
 static struct proc *vnlruproc;
@@ -1576,7 +1576,7 @@ reassignbuf(bp, newvp)
 
 /*
  * Create a vnode for a device.
- * Used for mounting the root file system.
+ * Used for mounting the root filesystem.
  */
 int
 bdevvp(dev, vpp)
@@ -1685,7 +1685,7 @@ addalias(nvp, dev)
  * vnode is being eliminated in vgone. The process is awakened
  * when the transition is completed, and an error returned to
  * indicate that the vnode is no longer usable (possibly having
- * been changed to a new file system type).
+ * been changed to a new filesystem type).
  */
 int
 vget(vp, flags, td)
@@ -2051,7 +2051,7 @@ vlruvp(struct vnode *vp)
 }
 
 /*
- * Disassociate the underlying file system from a vnode.
+ * Disassociate the underlying filesystem from a vnode.
  */
 static void
 vclean(vp, flags, td)
@@ -3110,7 +3110,7 @@ NDFREE(ndp, flags)
 }
 
 /*
- * Common file system object access control check routine.  Accepts a
+ * Common filesystem object access control check routine.  Accepts a
  * vnode's type, "mode", uid and gid, requested access mode, credentials,
  * and optional call-by-reference privused argument allowing vaccess()
  * to indicate to the caller whether privilege was used to satisfy the
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 44dec6d4d845..5cbef87fd206 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1025,7 +1025,7 @@ checkdirs(olddp, newdp)
 }
 
 /*
- * Unmount a file system.
+ * Unmount a filesystem.
  *
  * Note: unmount takes a path to the vnode mounted on as argument,
  * not special file (as before).
@@ -1071,7 +1071,7 @@ unmount(td, uap)
 	}
 
 	/*
-	 * Don't allow unmounting the root file system.
+	 * Don't allow unmounting the root filesystem.
 	 */
 	if (mp->mnt_flag & MNT_ROOTFS) {
 		vput(vp);
@@ -1090,7 +1090,7 @@ unmount(td, uap)
 }
 
 /*
- * Do the actual file system unmount.
+ * Do the actual filesystem unmount.
  */
 int
 dounmount(mp, flags, td)
@@ -3810,7 +3810,7 @@ out:
 
 #ifdef COMPAT_43
 /*
- * Read a block of directory entries in a file system independent format.
+ * Read a block of directory entries in a filesystem independent format.
  */
 #ifndef _SYS_SYSPROTO_H_
 struct ogetdirentries_args {
@@ -3950,7 +3950,7 @@ unionread:
 #endif /* COMPAT_43 */
 
 /*
- * Read a block of directory entries in a file system independent format.
+ * Read a block of directory entries in a filesystem independent format.
  */
 #ifndef _SYS_SYSPROTO_H_
 struct getdirentries_args {