4 files changed, 5 insertions, 5 deletions

diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index c360ba2b6e41..17c85b81c72b 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -679,7 +679,7 @@ struct aac_AifContainers {
 
 union aac_AifJobClient {
 	struct aac_AifContainers	container;	/* For Container and
-							 * file system progress
+							 * filesystem progress
 							 * ops; */
 	int32_t				scsi_dh;	/* For SCSI progress
 							 * ops */
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index bcf2908b502e..0800b6db372c 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -63,7 +63,7 @@ open_drive(struct drive *drive, struct thread *td, int verbose)
 
     /*
      * Yes, Bruce, I know this is horrible, but we
-     * don't have a root file system when we first
+     * don't have a root filesystem when we first
      * try to do this.  If you can come up with a
      * better solution, I'd really like it.  I'm
      * just putting it in now to add ammuntion to
diff --git a/sys/dev/vinum/vinumobj.h b/sys/dev/vinum/vinumobj.h
index 8a7868fd9fb2..9ee5e1ec7ee2 100644
--- a/sys/dev/vinum/vinumobj.h
+++ b/sys/dev/vinum/vinumobj.h
@@ -66,7 +66,7 @@ enum objflags {
     VF_WLABEL = 0x20,					    /* label area is writable */
     VF_LABELLING = 0x40,				    /* unit is currently being labelled */
     VF_WANTED = 0x80,					    /* someone is waiting to obtain a lock */
-    VF_RAW = 0x100,					    /* raw volume (no file system) */
+    VF_RAW = 0x100,					    /* raw volume (no filesystem) */
     VF_LOADED = 0x200,					    /* module is loaded */
     VF_CONFIGURING = 0x400,				    /* somebody is changing the config */
     VF_WILL_CONFIGURE = 0x800,				    /* somebody wants to change the config */
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 9dde28c1af07..ba4a27334427 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -833,8 +833,8 @@ build_rq_buffer(struct rqelement *rqe, struct plex *plex)
     bp->b_bcount = rqe->buflen << DEV_BSHIFT;		    /* number of bytes to transfer */
     bp->b_resid = bp->b_bcount;				    /* and it's still all waiting */
     bp->b_bufsize = bp->b_bcount;			    /* and buffer size */
-    bp->b_rcred = FSCRED;				    /* we have the file system credentials */
-    bp->b_wcred = FSCRED;				    /* we have the file system credentials */
+    bp->b_rcred = FSCRED;				    /* we have the filesystem credentials */
+    bp->b_wcred = FSCRED;				    /* we have the filesystem credentials */
 
     if (rqe->flags & XFR_MALLOCED) {			    /* this operation requires a malloced buffer */
 	bp->b_data = Malloc(bp->b_bcount);		    /* get a buffer to put it in */