summaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2007-05-29 19:02:34 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2007-05-29 19:02:34 +0000
commitc7dd4e6c88d2ebf3c0522cffe4b04830f5334eb7 (patch)
treee611b099ab289b6f68002690cd52259b527238ec /sys/ufs
parentc32d778c72106a5a52db85146c72e28edca9b9d2 (diff)
when mount -f'ing a dirty filesystem, do not clear the unclean flag,
the fs remains dirty. ok pedro@
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 906532b4b8c..c9a5d6134fd 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_vfsops.c,v 1.105 2007/05/29 18:40:53 pedro Exp $ */
+/* $OpenBSD: ffs_vfsops.c,v 1.106 2007/05/29 19:02:33 otto Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */
/*
@@ -752,7 +752,6 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
fs->fs_fmod = 0;
fs->fs_flags &= ~FS_UNCLEAN;
if (fs->fs_clean == 0) {
- fs->fs_flags |= FS_UNCLEAN;
#if 0
/*
* It is safe mount unclean file system
@@ -809,6 +808,8 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
ffs1_compat_read(fs, ump, sbloc);
+ if (fs->fs_clean == 0)
+ fs->fs_flags |= FS_UNCLEAN;
fs->fs_ronly = ronly;
size = fs->fs_cssize;
blks = howmany(size, fs->fs_fsize);