summaryrefslogtreecommitdiffstats
path: root/sys/ufs/ffs/ffs_vfsops.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2010-09-17 09:14:40 +0000
committerobrien <obrien@FreeBSD.org>2010-09-17 09:14:40 +0000
commit55122bfc2d91eba739d0b89cd31df25f07bc8874 (patch)
tree42eef56cb9a64d262fe707c251f8a9e906d542cf /sys/ufs/ffs/ffs_vfsops.c
parent65242e7677eb17e0fbc0c785ed30fc1a650e7f60 (diff)
downloadFreeBSD-src-55122bfc2d91eba739d0b89cd31df25f07bc8874.zip
FreeBSD-src-55122bfc2d91eba739d0b89cd31df25f07bc8874.tar.gz
Correct some non-code typos.
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index ccf346d..0a9b639 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -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
OpenPOWER on IntegriCloud