 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.376 2022/04/16 08:00:55 hannken Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.377 2022/11/10 10:53:29 hannken Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.376 2022/04/16 08:00:55 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.377 2022/11/10 10:53:29 hannken Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
 #include "opt_wapbl.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 @@ -673,27 +673,28 @@ ffs_mount(struct mount *mp, const char *
 			 */
 #ifndef QUOTA2
 			if (fs->fs_flags & FS_DOQUOTA2) {
 				ump->um_flags |= UFS_QUOTA2;
 				uprintf("%s: options QUOTA2 not enabled%s\n",
 				    mp->mnt_stat.f_mntonname,
 				    (mp->mnt_flag & MNT_FORCE) ? "" :
 				    ", not mounting");
 				DPRINTF("ffs_quota2 %d", EINVAL);
 				return EINVAL;
+			}
 #endif
 			fs->fs_ronly = 0;
-			fs->fs_clean <<= 1;
+			fs->fs_clean =
 			    fs->fs_clean == FS_ISCLEAN ? FS_WASCLEAN : 0;
 			fs->fs_fmod = 1;
 #ifdef WAPBL
 			if (fs->fs_flags & FS_DOWAPBL) {
 				const char *nm = mp->mnt_stat.f_mntonname;
 				if (!mp->mnt_wapbl_replay) {
 					printf("%s: log corrupted;"
 					    " replay cancelled\n", nm);
 					return EFTYPE;
+				}
 				printf("%s: replaying log to disk\n", nm);
 				error = wapbl_replay_write(mp->mnt_wapbl_replay,
 				    devvp);
 				if (error) {
 @@ -733,40 +734,42 @@ ffs_mount(struct mount *mp, const char *
 		if (args->fspec == NULL)
 			return 0;
+	}
 	error = set_statvfs_info(path, UIO_USERSPACE, args->fspec,
 	    UIO_USERSPACE, mp->mnt_op->vfs_name, mp, l);
 	if (error == 0)
 		(void)strncpy(fs->fs_fsmnt, mp->mnt_stat.f_mntonname,
 		    sizeof(fs->fs_fsmnt));
 	else {
 	    DPRINTF("set_statvfs_info returned %d", error);
+	}
 	fs->fs_flags &= ~FS_DOSOFTDEP;
 	if (fs->fs_fmod != 0) {	/* XXX */
 	if ((fs->fs_ronly && (fs->fs_clean & FS_ISCLEAN) == 0) ||
 	    (!fs->fs_ronly && (fs->fs_clean & FS_WASCLEAN) == 0)) {
 		printf("%s: file system not clean (fs_clean=%#x); "
 		    "please fsck(8)\n", mp->mnt_stat.f_mntfromname,
 		    fs->fs_clean);
+	}
 	if (fs->fs_fmod != 0) {
 		int err;
-		fs->fs_fmod = 0;
+		KASSERT(!fs->fs_ronly);
 		if (fs->fs_clean & FS_WASCLEAN)
 			fs->fs_time = time_second;
-		else {
+		fs->fs_fmod = 0;
 			printf("%s: file system not clean (fs_clean=%#x); "
 			    "please fsck(8)\n", mp->mnt_stat.f_mntfromname,
 			    fs->fs_clean);
 			printf("%s: lost blocks %" PRId64 " files %d\n",
 			    mp->mnt_stat.f_mntfromname, fs->fs_pendingblocks,
 			    fs->fs_pendinginodes);
 		err = UFS_WAPBL_BEGIN(mp);
 		if (err == 0) {
 			(void) ffs_cgupdate(ump, MNT_WAIT);
 			UFS_WAPBL_END(mp);
+		}
+	}
 	if ((mp->mnt_flag & MNT_SOFTDEP) != 0) {
 		printf("%s: `-o softdep' is no longer supported, "
 		    "consider `-o log'\n", mp->mnt_stat.f_mntfromname);
 		mp->mnt_flag &= ~MNT_SOFTDEP;
+	}
 	return (error);
 @@ -1336,26 +1339,27 @@ ffs_mountfs(struct vnode *devvp, struct
 	ump->um_maxfilesize = fs->fs_maxfilesize;
 	if (fs->fs_flags & ~(FS_KNOWN_FLAGS | FS_INTERNAL)) {
 		uprintf("%s: unknown ufs flags: 0x%08"PRIx32"%s\n",
 		    mp->mnt_stat.f_mntonname, fs->fs_flags,
 		    (mp->mnt_flag & MNT_FORCE) ? "" : ", not mounting");
 		if ((mp->mnt_flag & MNT_FORCE) == 0) {
 			error = EINVAL;
 			DPRINTF("no force %d", error);
 			goto out;
+		}
+	}
 	fs->fs_fmod = 0;
 	if (fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) {
 		fs->fs_pendingblocks = 0;
 		fs->fs_pendinginodes = 0;
+	}
 	ump->um_fstype = fstype;
 	if (fs->fs_sbsize < SBLOCKSIZE)
 		brelse(bp, BC_INVAL);
 	else
 		brelse(bp, 0);
 	bp = NULL;
 	if (ffs_is_appleufs(devvp, fs)) {
 @@ -1417,27 +1421,28 @@ ffs_mountfs(struct vnode *devvp, struct
 			    fs->fs_fsize);
 			error = EINVAL;
 			bset = BC_INVAL;
 			goto out;
+		}
 		brelse(bp, BC_INVAL);
 		bp = NULL;
+	}
 	fs->fs_ronly = ronly;
 	/* Don't bump fs_clean if we're replaying journal */
 	if (!((fs->fs_flags & FS_DOWAPBL) && (fs->fs_clean & FS_WASCLEAN))) {
 		if (ronly == 0) {
-			fs->fs_clean <<= 1;
+			fs->fs_clean =
 			    fs->fs_clean == FS_ISCLEAN ? FS_WASCLEAN : 0;
 			fs->fs_fmod = 1;
+		}
+	}
 	bsize = fs->fs_cssize;
 	blks = howmany(bsize, fs->fs_fsize);
 	if (fs->fs_contigsumsize > 0)
 		bsize += fs->fs_ncg * sizeof(int32_t);
 	bsize += fs->fs_ncg * sizeof(*fs->fs_contigdirs);
 	allocsbsize = bsize;
 	space = kmem_alloc((u_long)allocsbsize, KM_SLEEP);
 	fs->fs_csp = space;