 @@ -1,14 +1,14 @@
-/*	$NetBSD: inode.c,v 1.72 2017/02/08 16:11:40 rin Exp $	*/
+/*	$NetBSD: inode.c,v 1.73 2020/04/17 09:42:27 jdolecek 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.72 2017/02/08 16:11:40 rin Exp $");
+__RCSID("$NetBSD: inode.c,v 1.73 2020/04/17 09:42:27 jdolecek 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>
 @@ -453,27 +453,27 @@ setinodebuf(ino_t inum)
 		return;
 	inobufsize = ffs_blkroundup(sblock, INOBUFSIZE);
 	fullcnt = inobufsize / (is_ufs2 ? DINODE2_SIZE : DINODE1_SIZE);
 	readpercg = sblock->fs_ipg / fullcnt;
 	partialcnt = sblock->fs_ipg % fullcnt;
 	partialsize = partialcnt * (is_ufs2 ? DINODE2_SIZE : DINODE1_SIZE);
 	if (partialcnt != 0) {
 		readpercg++;
 	} else {
 		partialcnt = fullcnt;
 		partialsize = inobufsize;
+	}
 	if (inodebuf == NULL &&
-	    (inodebuf = malloc((unsigned)inobufsize)) == NULL)
+	    (inodebuf = aligned_alloc(DEV_BSIZE, (unsigned)inobufsize)) == NULL)
 		errexit("Cannot allocate space for inode buffer");
+}
 void
 freeinodebuf(void)
+{
 	if (inodebuf != NULL)
 		free((char *)inodebuf);
 	inodebuf = NULL;
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: setup.c,v 1.102 2018/10/05 09:49:23 hannken Exp $	*/
+/*	$NetBSD: setup.c,v 1.103 2020/04/17 09:42:27 jdolecek 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[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #else
-__RCSID("$NetBSD: setup.c,v 1.102 2018/10/05 09:49:23 hannken Exp $");
+__RCSID("$NetBSD: setup.c,v 1.103 2020/04/17 09:42:27 jdolecek Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/disk.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/ufs_bswap.h>
 @@ -116,30 +116,30 @@ setup(const char *dev, const char *origd
 	if (nflag || (fswritefd = open(dev, O_WRONLY)) < 0) {
 		fswritefd = -1;
 		if (preen)
 			pfatal("NO WRITE ACCESS");
 		printf("** %s (NO WRITE)\n", dev);
 		quiet = 0;
 	} else
 		if (!preen && !quiet)
 			printf("** %s\n", dev);
 	fsmodified = 0;
 	lfdir = 0;
 	initbarea(&sblk);
 	initbarea(&asblk);
-	sblk.b_un.b_buf = malloc(SBLOCKSIZE);
+	sblk.b_un.b_buf = aligned_alloc(DEV_BSIZE, SBLOCKSIZE);
-	sblock = malloc(SBLOCKSIZE);
+	sblock = aligned_alloc(DEV_BSIZE, SBLOCKSIZE);
-	asblk.b_un.b_buf = malloc(SBLOCKSIZE);
+	asblk.b_un.b_buf = aligned_alloc(DEV_BSIZE, SBLOCKSIZE);
-	altsblock = malloc(SBLOCKSIZE);
+	altsblock = aligned_alloc(DEV_BSIZE, SBLOCKSIZE);
 	if (sblk.b_un.b_buf == NULL || asblk.b_un.b_buf == NULL ||
 		sblock == NULL || altsblock == NULL)
 		errexit("Cannot allocate space for superblock");
 	if (strcmp(dev, origdev) && !forceimage) {
 		/*
 		 * dev isn't the original fs (for example it's a snapshot)
 		 * do getdiskinfo on the original device
 		 */
 		 fd = open(origdev, O_RDONLY);
 		 if (fd < 0) {
 			warn("Can't open %s", origdev);
 			return (0);
+		}
 @@ -448,32 +448,34 @@ setup(const char *dev, const char *origd
+	}
 	if (asblk.b_dirty && !bflag) {
 		memmove(sblk.b_un.b_fs, sblock, SBLOCKSIZE);
 		sb_oldfscompat_write(sblk.b_un.b_fs, sblocksave);
 		if (needswap)
 			ffs_sb_swap(sblk.b_un.b_fs, sblk.b_un.b_fs);
 		memmove(asblk.b_un.b_fs, sblk.b_un.b_fs, (size_t)sblock->fs_sbsize);
 		flush(fswritefd, &asblk);
+	}
 	/*
 	 * read in the summary info.
 	 */
 	asked = 0;
-	sblock->fs_csp = (struct csum *)calloc(1, sblock->fs_cssize);
+	sblock->fs_csp = (struct csum *)aligned_alloc(DEV_BSIZE,
 	    sblock->fs_cssize);
 	if (sblock->fs_csp == NULL) {
 		pwarn("cannot alloc %u bytes for summary info\n",
 		    sblock->fs_cssize);
 		goto badsblabel;
+	}
 	memset(sblock->fs_csp, 0, sblock->fs_cssize);
 	for (i = 0, j = 0; i < sblock->fs_cssize; i += sblock->fs_bsize, j++) {
 		size = sblock->fs_cssize - i < sblock->fs_bsize ?
 		    sblock->fs_cssize - i : sblock->fs_bsize;
 		ccsp = (struct csum *)((char *)sblock->fs_csp + i);
 		if (bread(fsreadfd, (char *)ccsp,
 		    FFS_FSBTODB(sblock, sblock->fs_csaddr + j * sblock->fs_frag),
 		    size) != 0 && !asked) {
 			pfatal("BAD SUMMARY INFORMATION");
 			if (reply("CONTINUE") == 0) {
 				markclean = 0;
 				exit(FSCK_EXIT_CHECK_FAILED);
+			}
 			asked++;
 @@ -482,32 +484,33 @@ setup(const char *dev, const char *origd
 			ffs_csum_swap(ccsp, ccsp, size);
 			bwrite(fswritefd, (char *)ccsp,
 			    FFS_FSBTODB(sblock,
 				sblock->fs_csaddr + j * sblock->fs_frag),
 			    size);
+		}
 		if (needswap)
 			ffs_csum_swap(ccsp, ccsp, size);
+	}
 	/*
 	 * allocate and initialize the necessary maps
 	 */
 	bmapsize = roundup(howmany(maxfsblock, NBBY), sizeof(int16_t));
-	blockmap = calloc((unsigned)bmapsize, sizeof (char));
+	blockmap = aligned_alloc(DEV_BSIZE, (unsigned)bmapsize);
 	if (blockmap == NULL) {
 		pwarn("cannot alloc %u bytes for blockmap\n",
 		    (unsigned)bmapsize);
 		goto badsblabel;
+	}
 	memset(blockmap, 0, bmapsize);
 	inostathead = calloc((unsigned)(sblock->fs_ncg),
 	    sizeof(struct inostatlist));
 	if (inostathead == NULL) {
 		pwarn("cannot alloc %u bytes for inostathead\n",
 		    (unsigned)(sizeof(struct inostatlist) * (sblock->fs_ncg)));
 		goto badsblabel;
+	}
 	/*
 	 * cs_ndir may be inaccurate, particularly if we're using the -b
 	 * option, so set a minimum to prevent bogus subdirectory reconnects
 	 * and really inefficient directory scans.
 	 * Also set a maximum in case the value is too large.
 	 */
 @@ -516,27 +519,27 @@ setup(const char *dev, const char *origd
 		numdirs = 1024;
 	if ((ino_t)numdirs > maxino + 1)
 		numdirs = maxino + 1;
 	dirhash = numdirs;
 	inplast = 0;
 	listmax = numdirs + 10;
 	inpsort = calloc((unsigned)listmax, sizeof(*inpsort));
 	inphead = calloc((unsigned)numdirs, sizeof(*inphead));
 	if (inpsort == NULL || inphead == NULL) {
 		pwarn("cannot alloc %u bytes for inphead\n",
 		    (unsigned)(numdirs * sizeof(struct inoinfo *)));
 		goto badsblabel;
+	}
-	cgrp = malloc(sblock->fs_cgsize);
+	cgrp = aligned_alloc(DEV_BSIZE, sblock->fs_cgsize);
 	if (cgrp == NULL) {
 		pwarn("cannot alloc %u bytes for cylinder group\n",
 		    sblock->fs_cgsize);
 		goto badsblabel;
+	}
 	bufinit();
 	if (sblock->fs_flags & FS_DOSOFTDEP)
 		usedsoftdep = 1;
 	else
 		usedsoftdep = 0;
 #ifndef NO_APPLE_UFS
 	if (!forceimage && dkw.dkw_parent[0])

 @@ -1,14 +1,14 @@
-/*	$NetBSD: utilities.c,v 1.65 2017/02/08 16:11:40 rin Exp $	*/
+/*	$NetBSD: utilities.c,v 1.66 2020/04/17 09:42:27 jdolecek 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.65 2017/02/08 16:11:40 rin Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.66 2020/04/17 09:42:27 jdolecek 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>
 @@ -125,45 +125,45 @@ reply(const char *question)
+}
 /*
  * Malloc buffers and set up cache.
  */
 void
 bufinit(void)
+{
 	struct bufarea *bp;
 	long bufcnt, i;
 	char *bufp;
 	pbp = pdirbp = (struct bufarea *)0;
-	bufp = malloc((unsigned int)sblock->fs_bsize);
+	bufp = aligned_alloc(DEV_BSIZE, (unsigned int)sblock->fs_bsize);
 	if (bufp == 0)
 		errexit("cannot allocate buffer pool");
 	cgblk.b_un.b_buf = bufp;
 	initbarea(&cgblk);
 #ifndef NO_APPLE_UFS
-	bufp = malloc((unsigned int)APPLEUFS_LABEL_SIZE);
+	bufp = aligned_alloc(DEV_BSIZE, (unsigned int)APPLEUFS_LABEL_SIZE);
 	if (bufp == 0)
 		errexit("cannot allocate buffer pool");
 	appleufsblk.b_un.b_buf = bufp;
 	initbarea(&appleufsblk);
 #endif
 	bufhead.b_next = bufhead.b_prev = &bufhead;
 	bufcnt = MAXBUFSPACE / sblock->fs_bsize;
 	if (bufcnt < MINBUFS)
 		bufcnt = MINBUFS;
 	for (i = 0; i < bufcnt; i++) {
 		bp = malloc(sizeof(struct bufarea));
-		bufp = malloc((unsigned int)sblock->fs_bsize);
+		bufp = aligned_alloc(DEV_BSIZE, (unsigned int)sblock->fs_bsize);
 		if (bp == NULL || bufp == NULL) {
 			if (i >= MINBUFS) {
 				if (bp)
 					free(bp);
 				if (bufp)
 					free(bufp);
 				break;
+			}
 			errexit("cannot allocate buffer pool");
+		}
 		bp->b_un.b_buf = bufp;
 		bp->b_prev = &bufhead;
 		bp->b_next = bufhead.b_next;