svn commit: r212788 - head/sys/ufs/ffs

[David E. O'Brien]

Author: obrien
Date: Fri Sep 17 09:14:40 2010
New Revision: 212788
URL: http://svn.freebsd.org/changeset/base/212788

Log:
  Correct some non-code typos.

Modified:
  head/sys/ufs/ffs/ffs_vfsops.c

Modified: head/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- head/sys/ufs/ffs/ffs_vfsops.c	Fri Sep 17 08:44:54 2010	(r212787)
+++ head/sys/ufs/ffs/ffs_vfsops.c	Fri Sep 17 09:14:40 2010	(r212788)
@@ -318,7 +318,7 @@ ffs_mount(struct mount *mp)
 					    fs->fs_fsmnt);
 					if (fs->fs_flags & FS_SUJ)
 						printf(
-"WARNING: Forced mount will invalidated journal contents\n");
+"WARNING: Forced mount will invalidate journal contents\n");
 					return (EPERM);
 				}
 			}
@@ -362,7 +362,7 @@ ffs_mount(struct mount *mp)
 		 * Soft updates is incompatible with "async",
 		 * so if we are doing softupdates stop the user
 		 * from setting the async flag in an update.
-		 * Softdep_mount() clears it in an initial mount 
+		 * Softdep_mount() clears it in an initial mount
 		 * or ro->rw remount.
 		 */
 		if (mp->mnt_flag & MNT_SOFTDEP) {
@@ -387,7 +387,7 @@ ffs_mount(struct mount *mp)
 			mp->mnt_flag |= MNT_NFS4ACLS;
 			MNT_IUNLOCK(mp);
 		}
-	
+
 		/*
 		 * If this is a snapshot request, take the snapshot.
 		 */
@@ -720,8 +720,7 @@ ffs_mountfs(devvp, mp, td)
 		if (ronly || (mp->mnt_flag & MNT_FORCE) ||
 		    ((fs->fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == 0 &&
 		     (fs->fs_flags & FS_DOSOFTDEP))) {
-			printf(
-"WARNING: %s was not properly dismounted\n",
+			printf("WARNING: %s was not properly dismounted\n",
 			    fs->fs_fsmnt);
 		} else {
 			printf(
@@ -729,7 +728,7 @@ ffs_mountfs(devvp, mp, td)
 			    fs->fs_fsmnt);
 			if (fs->fs_flags & FS_SUJ)
 				printf(
-"WARNING: Forced mount will invalidated journal contents\n");
+"WARNING: Forced mount will invalidate journal contents\n");
 			error = EPERM;
 			goto out;
 		}
@@ -840,7 +839,7 @@ ffs_mountfs(devvp, mp, td)
 	mp->mnt_stat.f_fsid.val[0] = fs->fs_id[0];
 	mp->mnt_stat.f_fsid.val[1] = fs->fs_id[1];
 	nmp = NULL;
-	if (fs->fs_id[0] == 0 || fs->fs_id[1] == 0 || 
+	if (fs->fs_id[0] == 0 || fs->fs_id[1] == 0 ||
 	    (nmp = vfs_getvfs(&mp->mnt_stat.f_fsid))) {
 		if (nmp)
 			vfs_rel(nmp);
@@ -873,8 +872,7 @@ ffs_mountfs(devvp, mp, td)
 
 		MNT_IUNLOCK(mp);
 #else
-		printf(
-"WARNING: %s: ACLs flag on fs but no ACLs support\n",
+		printf("WARNING: %s: ACLs flag on fs but no ACLs support\n",
 		    mp->mnt_stat.f_mntonname);
 #endif
 	}
@@ -1682,7 +1680,7 @@ ffs_sbupdate(mp, waitfor, suspended)
 	int i, size, error, allerror = 0;
 
 	if (fs->fs_ronly == 1 &&
-	    (mp->um_mountp->mnt_flag & (MNT_RDONLY | MNT_UPDATE)) != 
+	    (mp->um_mountp->mnt_flag & (MNT_RDONLY | MNT_UPDATE)) !=
 	    (MNT_RDONLY | MNT_UPDATE))
 		panic("ffs_sbupdate: write read-only filesystem");
 	/*
@@ -1836,7 +1834,7 @@ ffs_backgroundwritedone(struct buf *bp)
  *
  * Note that we set B_CACHE here, indicating that buffer is
  * fully valid and thus cacheable.  This is true even of NFS
- * now so we set it generally.  This could be set either here 
+ * now so we set it generally.  This could be set either here
  * or in biodone() since the I/O is synchronous.  We put it
  * here.
  */
@@ -1885,7 +1883,7 @@ ffs_bufwrite(struct buf *bp)
 	 * This optimization eats a lot of memory.  If we have a page
 	 * or buffer shortfall we can't do it.
 	 */
-	if (dobkgrdwrite && (bp->b_xflags & BX_BKGRDWRITE) && 
+	if (dobkgrdwrite && (bp->b_xflags & BX_BKGRDWRITE) &&
 	    (bp->b_flags & B_ASYNC) &&
 	    !vm_page_count_severe() &&
 	    !buf_dirty_count_severe()) {
@@ -1927,7 +1925,7 @@ ffs_bufwrite(struct buf *bp)
 			bundirty(bp);
 #else
 		bundirty(bp);
-#endif 
+#endif
 
 		/*
 		 * Initiate write on the copy, release the original to