 @@ -1,14 +1,14 @@
-/*	$NetBSD: fsck.h,v 1.56 2022/11/17 06:40:38 chs Exp $	*/
+/*	$NetBSD: fsck.h,v 1.56.2.1 2023/05/13 12:13:54 martin Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
+ *
  * This software was developed for the FreeBSD Project by Marshall
  * Kirk McKusick and Network Associates Laboratories, the Security
  * Research Division of Network Associates, Inc. under DARPA/SPAWAR
  * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
  * research program
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -87,27 +87,27 @@ struct inostat {
 #define	USTATE	01		/* inode not allocated */
 #define	FSTATE	02		/* inode is file */
 #define	DSTATE	03		/* inode is directory */
 #define	DFOUND	04		/* directory found during descent */
 #define	DCLEAR	05		/* directory is to be cleared */
 #define	FCLEAR	06		/* file is to be cleared */
 #define	DMARK	07		/* used in propagate()'s traversal algorithm */
 /*
  * Inode state information is contained on per cylinder group lists
  * which are described by the following structure.
  */
 extern struct inostatlist {
-	long    il_numalloced;  /* number of inodes allocated in this cg */
+	size_t  il_numalloced;  /* number of inodes allocated in this cg */
 	struct inostat *il_stat;/* inostat info for this cylinder group */
 } *inostathead;
 /*
  * buffer cache structure.
  */
 struct bufarea {
 	struct bufarea *b_next;		/* free list queue */
 	struct bufarea *b_prev;		/* free list queue */
 	daddr_t b_bno;
 	int b_size;
 	int b_errs;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: inode.c,v 1.73 2020/04/17 09:42:27 jdolecek Exp $	*/
+/*	$NetBSD: inode.c,v 1.73.6.1 2023/05/13 12:13:54 martin Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)inode.c	8.8 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: inode.c,v 1.73 2020/04/17 09:42:27 jdolecek Exp $");
+__RCSID("$NetBSD: inode.c,v 1.73.6.1 2023/05/13 12:13:54 martin Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 #include <ufs/ufs/ufs_bswap.h>
 @@ -721,31 +721,31 @@ allocino(ino_t request, int type)
 	if (request == 0)
 		request = UFS_ROOTINO;
 	else if (inoinfo(request)->ino_state != USTATE)
 		return (0);
 	for (ino = request; ino < maxino; ino++) {
 		info = inoinfo(ino);
 		if (info->ino_state == USTATE)
 			break;
+	}
 	if (ino == maxino)
 		return (0);
 	cg = ino_to_cg(sblock, ino);
 	/* If necessary, extend the inoinfo array. grow exponentially */
-	if ((ino % sblock->fs_ipg) >= (uint64_t)inostathead[cg].il_numalloced) {
+	if ((ino % sblock->fs_ipg) >= inostathead[cg].il_numalloced) {
-		unsigned long newalloced, i;
+		size_t newalloced, i;
 		newalloced = MIN(sblock->fs_ipg,
 			MAX(2 * inostathead[cg].il_numalloced, 10));
-		info = calloc(newalloced, sizeof(struct inostat));
+		info = calloc(newalloced, sizeof(*info));
 		if (info == NULL) {
 			pwarn("cannot alloc %lu bytes to extend inoinfo\n",
 				sizeof(struct inostat) * newalloced);
 			return 0;
+		}
 		memmove(info, inostathead[cg].il_stat,
 			inostathead[cg].il_numalloced * sizeof(*info));
 		for (i = inostathead[cg].il_numalloced; i < newalloced; i++) {
 			info[i].ino_state = USTATE;
+		}
 		if (inostathead[cg].il_numalloced)
 			free(inostathead[cg].il_stat);
 		inostathead[cg].il_stat = info;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pass4.c,v 1.28.38.1 2023/05/13 11:51:14 martin Exp $	*/
+/*	$NetBSD: pass4.c,v 1.28.38.2 2023/05/13 12:13:54 martin Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: pass4.c,v 1.28.38.1 2023/05/13 11:51:14 martin Exp $");
+__RCSID("$NetBSD: pass4.c,v 1.28.38.2 2023/05/13 12:13:54 martin Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 #include <err.h>
 @@ -52,27 +52,28 @@ __RCSID("$NetBSD: pass4.c,v 1.28.38.1 20
 #include <string.h>
 #include "fsutil.h"
 #include "fsck.h"
 #include "extern.h"
 void
 pass4(void)
+{
 	ino_t inumber;
 	struct zlncnt *zlnp;
 	union dinode *dp;
 	struct inodesc idesc;
-	int n, i;
+	int n;
 	size_t i;
 	uint32_t cg;
 	struct inostat *info;
 	memset(&idesc, 0, sizeof(struct inodesc));
 	idesc.id_func = pass4check;
 	for (cg = 0; cg < sblock->fs_ncg; cg++) {
 		if (got_siginfo) {
 			fprintf(stderr,
 			    "%s: phase 4: cyl group %d of %d (%d%%)\n",
 			    cdevname(), cg, sblock->fs_ncg,
 			    cg * 100 / sblock->fs_ncg);
 			got_siginfo = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: utilities.c,v 1.67 2022/11/17 06:40:38 chs Exp $	*/
+/*	$NetBSD: utilities.c,v 1.67.2.1 2023/05/13 12:13:54 martin Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #else
-__RCSID("$NetBSD: utilities.c,v 1.67 2022/11/17 06:40:38 chs Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.67.2.1 2023/05/13 12:13:54 martin Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ufs/quota2.h>
 @@ -580,27 +580,27 @@ void
 infohandler(int sig)
+{
 	got_siginfo = 1;
+}
 /*
  * Look up state information for an inode.
  */
 struct inostat *
 inoinfo(ino_t inum)
+{
 	static struct inostat unallocated = { USTATE, 0, 0 };
 	struct inostatlist *ilp;
-	int iloff;
+	size_t iloff;
 	if (inum > maxino)
 		errexit("inoinfo: inumber %llu out of range",
 		    (unsigned long long)inum);
 	ilp = &inostathead[inum / sblock->fs_ipg];
 	iloff = inum % sblock->fs_ipg;
 	if (iloff >= ilp->il_numalloced)
 		return (&unallocated);
 	return (&ilp->il_stat[iloff]);
+}
 void
 sb_oldfscompat_read(struct fs *fs, struct fs **fssave)