 @@ -1,14 +1,14 @@
-$NetBSD: UPDATING,v 1.325 2021/11/22 12:30:34 martin Exp $
+$NetBSD: UPDATING,v 1.326 2021/12/07 21:37:36 andvar Exp $
 This file (UPDATING) is intended to be a brief reference to recent
 changes that might cause problems in the build process, and a guide for
 what to do if something doesn't work.
 For a more detailed description of the recommended way to build NetBSD
 using build.sh, see the BUILDING file.
 Note that much of the advice in this UPDATING file was written before
 build.sh existed.  Nevertheless, the advice here may be useful for
 working around specific problems with build.sh.
 Sections are marked with "^^^^^".  After the section on "Recent changes"
 @@ -182,27 +182,27 @@ Recent changes:
 	We will re-import these radeon firmware images another way
 	later.
 20190727:
 	The uefi bootloader has gained tftp support and needs a clean
 	build. If you do update builds, manually clean its object
 	directory by something like:
 	cd sys/arch/i386/stand/efiboot && make clean
 20190723:
 	The jemalloc allocator in libc is now build without extended
 	debugging (for performance reasons). In update builds make sure
-	to rebuild it completly, by removing all affected object files,
+	to rebuild it completely, by removing all affected object files,
 	including compat builds, something like:
 	cd /usr/obj && find . -type d -name jemalloc|xargs rm -rf
 20190207:
 	GCC 7 switched for many ports.  Update builds are likely to fail.
 20180924:
 	A newer OpenSSL version has been imported. If you are doing
 	update builds, make sure to remove all old obj dirs, like:
 	cd /usr/obj && find . -type d -name openssl | xargs rm -rf
 20180717:
 	On aarch64 int64_t and related types have changed from long long

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.119 2021/10/23 06:49:46 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $	*/
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org>
  * 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.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.119 2021/10/23 06:49:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $");
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_pmap.h"
 #include "opt_uvmhist.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/asan.h>
 #include <sys/atomic.h>
 @@ -169,27 +169,27 @@ PMAP_COUNTER(unwire_failure, "pmap_unwir
 				aarch64_tlbi_by_va_ll((va));		\
 			else						\
 				aarch64_tlbi_by_asid_va_ll((asid), (va)); \
 		} else {						\
 			if ((asid) == 0)				\
 				aarch64_tlbi_by_va((va));		\
 			else						\
 				aarch64_tlbi_by_asid_va((asid), (va));	\
 		}							\
 	} while (0/*CONSTCOND*/)
 /*
  * require access permission in pte to invalidate instruction cache.
- * change the pte to accessible temporarly before cpu_icache_sync_range().
+ * change the pte to be accessible temporarily before cpu_icache_sync_range().
  * this macro modifies PTE (*ptep). need to update PTE after this.
  */
 #define PTE_ICACHE_SYNC_PAGE(pte, ptep, asid, va, ll)			\
 	do {								\
 		atomic_swap_64((ptep), (pte) | LX_BLKPAG_AF);		\
 		AARCH64_TLBI_BY_ASID_VA((asid), (va), (ll));		\
 		cpu_icache_sync_range((va), PAGE_SIZE);			\
 	} while (0/*CONSTCOND*/)
 #define VM_PAGE_TO_PP(pg)	(&(pg)->mdpage.mdpg_pp)
 #define L3INDEXMASK	(L3_SIZE * Ln_ENTRIES - 1)
 #define PDPSWEEP_TRIGGER	512

 @@ -1,14 +1,14 @@
-*	$NetBSD: res_func.sa,v 1.5 2001/09/16 16:34:32 wiz Exp $
+*	$NetBSD: res_func.sa,v 1.6 2021/12/07 21:37:36 andvar Exp $
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
 *	M68000 Hi-Performance Microprocessor Division
 *	M68040 Software Package
+*
 *	M68040 Software Package Copyright (c) 1993, 1994 Motorola Inc.
 *	All rights reserved.
+*
 *	THE SOFTWARE is provided on an "AS IS" basis and without warranty.
 *	To the maximum extent permitted by applicable law,
 *	MOTOROLA DISCLAIMS ALL WARRANTIES WHETHER EXPRESS OR IMPLIED,
 *	INCLUDING IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A
 *	PARTICULAR PURPOSE and any warranty against infringement with
 @@ -428,27 +428,27 @@ normal:
 	bne	ck_wrap		;if so, check if it is a potential
 *				;wrap-around case
 fix_stk:
 	move.b	#$fe,CU_SAVEPC(a6)
 	bclr.b	#E1,E_BYTE(a6)
 	clr.w	NMNEXC(a6)
 	st.b	RES_FLG(a6)	;indicate that a restore is needed
 	rts
+*
 * cu_dnrm handles all cu-only instructions (fmove, fabs, fneg, and
-* ftst) completly in software without an frestore to the 040.
+* ftst) completely in software without an frestore to the 040.
+*
 cu_dnrm:
 	st.b	CU_ONLY(a6)
 	move.w	CMDREG1B(a6),d0
 	andi.b	#$3b,d0		;isolate bits to select inst
 	tst.b	d0
 	beq.l	cu_dmove	;if zero, it is an fmove
 	cmpi.b	#$18,d0
 	beq.l	cu_dabs		;if $18, it is fabs
 	cmpi.b	#$1a,d0
 	beq.l	cu_dneg		;if $1a, it is fneg
+*
 * Inst is ftst.  Check the source operand and set the cc's accordingly.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vald_acpi.c,v 1.7 2021/11/01 21:28:03 andvar Exp $ */
+/*	$NetBSD: vald_acpi.c,v 1.8 2021/12/07 21:37:36 andvar Exp $ */
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Masanori Kanaoka.
+ *
  * 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.
 @@ -64,27 +64,27 @@
 /*
  * ACPI VALD Driver for Toshiba Libretto L3.
  *	This driver is based on acpibat driver.
  */
 /*
  * Obtain information of Toshiba "GHCI" Method from next URL.
  *           http://www.buzzard.org.uk/toshiba/docs.html
  *           http://memebeam.org/toys/ToshibaAcpiDriver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.7 2021/11/01 21:28:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.8 2021/12/07 21:37:36 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #define _COMPONENT          ACPI_RESOURCE_COMPONENT
 ACPI_MODULE_NAME            ("vald_acpi")
 #define GHCI_WORDS 6
 @@ -429,27 +429,27 @@ vald_acpi_libright_get_bus(ACPI_HANDLE h
 	struct vald_acpi_softc *sc = context;
 	ACPI_STATUS rv;
 	ACPI_BUFFER buf;
 	ACPI_OBJECT *param, *PrtElement;
 	int i, *pi;
 	rv = acpi_eval_struct(handle, "_BCL", &buf);
 	if (ACPI_FAILURE(rv))
 		return (AE_OK);
 	sc->lcd_handle = handle;
 	param = buf.Pointer;
 	if (param->Type == ACPI_TYPE_PACKAGE) {
-		printf("_BCL retrun: %d packages\n", param->Package.Count);
+		printf("_BCL return: %d packages\n", param->Package.Count);
 		sc->lcd_num = param->Package.Count;
 		sc->lcd_level = ACPI_ALLOCATE(sizeof(int) * sc->lcd_num);
 		if (sc->lcd_level == NULL) {
 			if (buf.Pointer)
 				ACPI_FREE(buf.Pointer);
 			return (AE_NO_MEMORY);
+		}
 		PrtElement = param->Package.Elements;
 		pi = sc->lcd_level;
 		for (i = 0; i < param->Package.Count; i++) {
 			if (PrtElement->Type == ACPI_TYPE_INTEGER) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hamming.c,v 1.1 2011/02/26 18:07:31 ahoka Exp $	*/
+/*	$NetBSD: hamming.c,v 1.2 2021/12/07 21:37:37 andvar Exp $	*/
 /*
  * Copyright (c) 2008, Atmel Corporation
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  * - Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the disclaimer below.
+ *
  * Atmel's name may not be used to endorse or promote products derived from
 @@ -17,27 +17,27 @@
  * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
  * DISCLAIMED. IN NO EVENT SHALL ATMEL 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hamming.c,v 1.1 2011/02/26 18:07:31 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hamming.c,v 1.2 2021/12/07 21:37:37 andvar Exp $");
 #include <sys/param.h>
 #include <lib/libkern/libkern.h>
 #include "hamming.h"
 /**
  * Calculates the 22-bit hamming code for a 256-bytes block of data.
  * \param data  Data buffer to calculate code for.
  * \param code  Pointer to a buffer where the code should be stored.
  */
 void
 hamming_compute_256(const uint8_t *data, uint8_t *code)
+{
 @@ -92,27 +92,27 @@ hamming_compute_256(const uint8_t *data,
 			 * even_line_code and odd_line_code, such as
 			 *     even_line_code bits: P128  P64  P32
 			 *                        P16  P8  P4  P2  P1
 			 *     odd_line_code  bits: P128' P64' P32' P16'
 			 *                        P8' P4' P2' P1'
 			 */
 			even_line_code ^= (255 - i);
 			odd_line_code ^= i;
+		}
+	}
 	/*-
 	 * At this point, we have the line parities, and the column sum.
-	 * First, We must caculate the parity group values on the column sum.
+	 * First, We must calculate the parity group values on the column sum.
 	 */
 	for (i = 0; i < 8; i++) {
 		if (column_sum & 1) {
 			even_column_code ^= (7 - i);
 			odd_column_code ^= i;
+		}
 		column_sum >>= 1;
+	}
 	/*-
 	 * Now, we must interleave the parity values,
 	 * to obtain the following layout:
 	 * Code[0] = Line1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chfs.h,v 1.10 2018/04/19 21:50:10 christos Exp $	*/
+/*	$NetBSD: chfs.h,v 1.11 2021/12/07 21:37:37 andvar Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (C) 2009 Ferenc Havasi <havasi@inf.u-szeged.hu>
  * Copyright (C) 2009 Zoltan Sogor <weth@inf.u-szeged.hu>
  * Copyright (C) 2009 David Tengeri <dtengeri@inf.u-szeged.hu>
  * Copyright (C) 2009 Tamas Toth <ttoth@inf.u-szeged.hu>
  * Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
 @@ -189,27 +189,27 @@ node_next(struct chfs_node_ref *nref)
 /* struct chfs_dirent - full representation of a directory entry */
 struct chfs_dirent
+{
 	struct chfs_node_ref *nref;		/* nref of the dirent */
 	TAILQ_ENTRY(chfs_dirent) fds;	/* directory entries */
 	uint64_t version;				/* version */
 	ino_t vno;						/* vnode number */
 	uint32_t nhash;					/* name hash */
 	enum chtype type;				/* type of the dirent */
 	uint8_t  nsize;					/* length of its name */
 	uint8_t  name[0];				/* name of the directory */
 };
-/* struct chfs_tmp_dnode - used temporarly while building a data node */
+/* struct chfs_tmp_dnode - used temporarily while building a data node */
 struct chfs_tmp_dnode {
 	struct chfs_full_dnode *node;	/* associated full dnode */
 	uint64_t version;				/* version of the tmp node */
 	uint32_t data_crc;				/* CRC of the data */
 	uint16_t overlapped;			/* is overlapped */
 	struct chfs_tmp_dnode *next;	/* next tmp node */
 };
 /* struct chfs_tmp_dnode_info - tmp nodes are stored in rb trees */
 struct chfs_tmp_dnode_info {
 	struct rb_node rb_node;			/* rb tree entry */
 	struct chfs_tmp_dnode *tmpnode;	/* associated tmp node */
 };
 @@ -366,27 +366,27 @@ struct chfs_mount {
 	uint32_t chm_wasted_size;		/* padding */
 	/*
 	 * chm_lock_sizes:
 	 * Used to protect the (free, used, etc.) sizes of the FS
 	 * (and also the sizes of each eraseblock).
 	 * If you have to lock chm_lock_mountfields and also chm_lock_sizes,
 	 * you must lock chm_lock_mountfields first.
 	 */
 	kmutex_t chm_lock_sizes;
 	/*
 	 * eraseblock queues
-	 * free: completly free
+	 * free: completely free
 	 * clean: contains only valid data
 	 * dirty: contains valid and deleted data
 	 * very_dirty: contains mostly deleted data (should be GC'd)
 	 * erasable: doesn't contain valid data (should be erased)
 	 * erase_pending: we can erase blocks from this queue
 	 */
 	struct chfs_eraseblock_queue chm_free_queue;
 	struct chfs_eraseblock_queue chm_clean_queue;
 	struct chfs_eraseblock_queue chm_dirty_queue;
 	struct chfs_eraseblock_queue chm_very_dirty_queue;
 	struct chfs_eraseblock_queue chm_erasable_pending_wbuf_queue;
 	struct chfs_eraseblock_queue chm_erase_pending_queue;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chfs_write.c,v 1.6 2021/07/19 21:04:39 andvar Exp $	*/
+/*	$NetBSD: chfs_write.c,v 1.7 2021/12/07 21:37:37 andvar Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (C) 2010 David Tengeri <dtengeri@inf.u-szeged.hu>
  * Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>
  * Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -100,27 +100,27 @@ retry:
 		if (err)
 			goto out;
+	}
 	/* allocating a new node reference */
 	nref = chfs_alloc_node_ref(chmp->chm_nextblock);
 	if (!nref) {
 		err = ENOMEM;
 		goto out;
+	}
 	mutex_enter(&chmp->chm_lock_sizes);
-	/* caculating offset and sizes  */
+	/* calculating offset and sizes  */
 	nref->nref_offset = chmp->chm_ebh->eb_size - chmp->chm_nextblock->free_size;
 	chfs_change_size_free(chmp, chmp->chm_nextblock, -CHFS_PAD(size));
 	vec.iov_base = fvnode;
 	vec.iov_len = CHFS_PAD(size);
 	/* write it into the writebuffer */
 	err = chfs_write_wbuf(chmp, &vec, 1, nref->nref_offset, &retlen);
 	if (err || retlen != CHFS_PAD(size)) {
 		/* there was an error during write */
 		chfs_err("error while writing out flash vnode to the media\n");
 		chfs_err("err: %d | size: %zu | retlen : %zu\n",
 		    err, CHFS_PAD(size), retlen);
 		chfs_change_size_dirty(chmp,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chfs_vnops.c,v 1.46 2021/10/20 03:08:19 thorpej Exp $	*/
+/*	$NetBSD: chfs_vnops.c,v 1.47 2021/12/07 21:37:37 andvar Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>
  * Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -148,27 +148,27 @@ chfs_lookup(void *v)
 				& ISLASTCN)) {
 				error = ENOTDIR;
 				goto out;
+			}
 			dbg("vno@allocating new vnode: %llu\n",
 				(unsigned long long)fd->vno);
 			error = VFS_VGET(dvp->v_mount, fd->vno, LK_EXCLUSIVE,
 			    vpp);
+		}
+	}
 	/* Store the result of this lookup in the cache.  Avoid this if the
 	 * request was for creation, as it does not improve timings on
-	 * emprical tests. */
+	 * empirical tests. */
 	if (cnp->cn_nameiop != CREATE && (cnp->cn_flags & ISDOTDOT) == 0) {
 		cache_enter(dvp, *vpp, cnp->cn_nameptr, cnp->cn_namelen,
 			    cnp->cn_flags);
+	}
 out:
 	/* If there were no errors, *vpp cannot be NULL. */
 	KASSERT(IFF(error == 0, *vpp != NULL));
 	KASSERT(VOP_ISLOCKED(dvp));
 	if (error)
 		return error;
 	if (*vpp != dvp)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ebh.c,v 1.8 2021/08/09 21:38:05 andvar Exp $	*/
+/*	$NetBSD: ebh.c,v 1.9 2021/12/07 21:37:37 andvar Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (C) 2009 Ferenc Havasi <havasi@inf.u-szeged.hu>
  * Copyright (C) 2009 Zoltan Sogor <weth@inf.u-szeged.hu>
  * Copyright (C) 2009 David Tengeri <dtengeri@inf.u-szeged.hu>
  * Copyright (C) 2009 Tamas Toth <ttoth@inf.u-szeged.hu>
  * Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
 @@ -119,27 +119,27 @@ nor_calc_data_offs(struct chfs_ebh *ebh,
  * nand_calc_data_offs - calculates data offset on NAND flash
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number
  * @offset: offset within the eraseblock
  */
 int
 nand_calc_data_offs(struct chfs_ebh *ebh, int pebnr, int offset)
+{
 	return pebnr * ebh->flash_if->erasesize + offset +
 * ebh->flash_if->page_size;
+}
 /**
- * nor_read_eb_hdr - read ereaseblock header from NOR flash
+ * nor_read_eb_hdr - read eraseblock header from NOR flash
+ *
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number
  * @ebhdr: whereto store the data
+ *
  * Reads the eraseblock header from media.
  * Returns zero in case of success, error code in case of fail.
  */
 int
 nor_read_eb_hdr(struct chfs_ebh *ebh,
     int pebnr, struct chfs_eb_hdr *ebhdr)
+{
 	int ret;
 @@ -157,27 +157,27 @@ nor_read_eb_hdr(struct chfs_ebh *ebh,
 	ofs += CHFS_EB_EC_HDR_SIZE;
 	ret = flash_read(ebh->flash_dev,
 	    ofs, CHFS_EB_HDR_NOR_SIZE,
 	    &retlen, (unsigned char *) &ebhdr->u.nor_hdr);
 	if (ret || retlen != CHFS_EB_HDR_NOR_SIZE)
 		return ret;
 	return 0;
+}
 /**
- * nand_read_eb_hdr - read ereaseblock header from NAND flash
+ * nand_read_eb_hdr - read eraseblock header from NAND flash
+ *
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number
  * @ebhdr: whereto store the data
+ *
  * Reads the eraseblock header from media. It is on the first two page.
  * Returns zero in case of success, error code in case of fail.
  */
 int
 nand_read_eb_hdr(struct chfs_ebh *ebh, int pebnr,
     struct chfs_eb_hdr *ebhdr)
+{
 	int ret;
 @@ -196,27 +196,27 @@ nand_read_eb_hdr(struct chfs_ebh *ebh, i
 	/* Read NAND eraseblock header from the second page */
 	ofs += ebh->flash_if->page_size;
 	ret = flash_read(ebh->flash_dev,
 	    ofs, CHFS_EB_HDR_NAND_SIZE, &retlen,
 	    (unsigned char *) &ebhdr->u.nand_hdr);
 	if (ret || retlen != CHFS_EB_HDR_NAND_SIZE)
 		return ret;
 	return 0;
+}
 /**
- * nor_write_eb_hdr - write ereaseblock header to NOR flash
+ * nor_write_eb_hdr - write eraseblock header to NOR flash
+ *
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number whereto write
  * @ebh: ebh to write
+ *
  * Writes the eraseblock header to media.
  * Returns zero in case of success, error code in case of fail.
  */
 int
 nor_write_eb_hdr(struct chfs_ebh *ebh, int pebnr, struct chfs_eb_hdr *ebhdr)
+{
 	int ret, crc;
 	size_t retlen;
 @@ -233,27 +233,27 @@ nor_write_eb_hdr(struct chfs_ebh *ebh, i
 	KASSERT(pebnr >= 0 && pebnr < ebh->peb_nr);
 	ret = flash_write(ebh->flash_dev,
 	    ofs, CHFS_EB_HDR_NOR_SIZE, &retlen,
 	    (unsigned char *) &ebhdr->u.nor_hdr);
 	if (ret || retlen != CHFS_EB_HDR_NOR_SIZE)
 		return ret;
 	return 0;
+}
 /**
- * nand_write_eb_hdr - write ereaseblock header to NAND flash
+ * nand_write_eb_hdr - write eraseblock header to NAND flash
+ *
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number whereto write
  * @ebh: ebh to write
+ *
  * Writes the eraseblock header to media.
  * Returns zero in case of success, error code in case of fail.
  */
 int
 nand_write_eb_hdr(struct chfs_ebh *ebh, int pebnr,
     struct chfs_eb_hdr *ebhdr)
+{
 	int ret, crc;
 @@ -272,27 +272,27 @@ nand_write_eb_hdr(struct chfs_ebh *ebh,
 	ebhdr->u.nand_hdr.crc = htole32(crc);
 	ret = flash_write(ebh->flash_dev, ofs,
 	    CHFS_EB_HDR_NAND_SIZE, &retlen,
 	    (unsigned char *) &ebhdr->u.nand_hdr);
 	if (ret || retlen != CHFS_EB_HDR_NAND_SIZE)
 		return ret;
 	return 0;
+}
 /**
- * nor_check_eb_hdr - check ereaseblock header read from NOR flash
+ * nor_check_eb_hdr - check eraseblock header read from NOR flash
+ *
  * @ebh: chfs eraseblock handler
  * @buf: eraseblock header to check
+ *
  * Returns eraseblock header status.
  */
 int
 nor_check_eb_hdr(struct chfs_ebh *ebh, void *buf)
+{
 	uint32_t magic, crc, hdr_crc;
 	struct chfs_eb_hdr *ebhdr = buf;
 	le32 lid_save;
 @@ -351,27 +351,27 @@ nor_check_eb_hdr(struct chfs_ebh *ebh, v
 		return EBHDR_LEB_BADCRC;
+	}
 	// check dirty
 	if (!(le32toh(lid_save) & CHFS_LID_NOT_DIRTY_BIT)) {
 		dbg_ebh("dirty ebhdr found\n");
 		return EBHDR_LEB_DIRTY;
+	}
 	return EBHDR_LEB_OK;
+}
 /**
- * nand_check_eb_hdr - check ereaseblock header read from NAND flash
+ * nand_check_eb_hdr - check eraseblock header read from NAND flash
+ *
  * @ebh: chfs eraseblock handler
  * @buf: eraseblock header to check
+ *
  * Returns eraseblock header status.
  */
 int
 nand_check_eb_hdr(struct chfs_ebh *ebh, void *buf)
+{
 	uint32_t magic, crc, hdr_crc;
 	struct chfs_eb_hdr *ebhdr = buf;
 	//check is there a header
 @@ -411,27 +411,27 @@ nand_check_eb_hdr(struct chfs_ebh *ebh,
 	crc = crc32(0, (uint8_t *) &ebhdr->u.nand_hdr + 4,
 	    CHFS_EB_HDR_NAND_SIZE - 4);
 	if (crc != hdr_crc) {
 		dbg_ebh("bad crc found\n");
 		return EBHDR_LEB_BADCRC;
+	}
 	return EBHDR_LEB_OK;
+}
 /**
- * nor_mark_eb_hdr_dirty_flash- mark ereaseblock header dirty on NOR flash
+ * nor_mark_eb_hdr_dirty_flash- mark eraseblock header dirty on NOR flash
+ *
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number
  * @lid: leb id (its bit number 31 will be set to 0)
+ *
  * It pulls the CHFS_LID_NOT_DIRTY_BIT to zero on flash.
+ *
  * Returns zero in case of success, error code in case of fail.
  */
 int
 nor_mark_eb_hdr_dirty_flash(struct chfs_ebh *ebh, int pebnr, int lid)
+{
 	int ret;
 @@ -446,27 +446,27 @@ nor_mark_eb_hdr_dirty_flash(struct chfs_
 	    + CHFS_GET_MEMBER_POS(struct chfs_nor_eb_hdr , lid);
 	ret = flash_write(ebh->flash_dev, ofs, sizeof(lid), &retlen,
 	    (unsigned char *) &lid);
 	if (ret || retlen != sizeof(lid)) {
 		chfs_err("can't mark peb dirty");
 		return ret;
+	}
 	return 0;
+}
 /**
- * nor_invalidate_eb_hdr - invalidate ereaseblock header on NOR flash
+ * nor_invalidate_eb_hdr - invalidate eraseblock header on NOR flash
+ *
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number
+ *
  * Sets crc and lip field to zero.
  * Returns zero in case of success, error code in case of fail.
  */
 int
 nor_invalidate_eb_hdr(struct chfs_ebh *ebh, int pebnr)
+{
 	int ret;
 	size_t retlen;
 	off_t ofs;
 @@ -481,27 +481,27 @@ nor_invalidate_eb_hdr(struct chfs_ebh *e
 	ret = flash_write(ebh->flash_dev,
 	    ofs, CHFS_INVALIDATE_SIZE, &retlen,
 	    (unsigned char *) &zero_buf);
 	if (ret || retlen != CHFS_INVALIDATE_SIZE) {
 		chfs_err("can't invalidate peb");
 		return ret;
+	}
 	return 0;
+}
 /**
- * mark_eb_hdr_free - free ereaseblock header on NOR or NAND flash
+ * mark_eb_hdr_free - free eraseblock header on NOR or NAND flash
+ *
  * @ebh: chfs eraseblock handler
  * @pebnr: eraseblock number
  * @ec: erase counter of PEB
+ *
  * Write out the magic and erase counter to the physical eraseblock.
  * Returns zero in case of success, error code in case of fail.
  */
 int
 mark_eb_hdr_free(struct chfs_ebh *ebh, int pebnr, int ec)
+{
 	int ret, crc;
 	size_t retlen;
 @@ -1413,27 +1413,27 @@ nand_process_eb(struct chfs_ebh *ebh, st
 	max_serial = le64toh(ebhdr->u.nand_hdr.serial);
 	if (max_serial > *ebh->max_serial) {
 		*ebh->max_serial = max_serial;
+	}
 count_mean:
 	si->sum_of_ec += erase_cnt;
 	si->num_of_eb++;
 	return err;
+}
 /**
- * chfs_scan - scans the media and returns informations about it
+ * chfs_scan - scans the media and returns information about it
  * @ebh: chfs eraseblock handler
+ *
  * This function scans through the media and returns information about it or if
  * it fails NULL will be returned.
  */
 struct chfs_scan_info *
 chfs_scan(struct chfs_ebh *ebh)
+{
 	struct chfs_scan_info *si;
 	struct chfs_eb_hdr *ebhdr;
 	int pebnr, err;
 	si = kmem_alloc(sizeof(*si), KM_SLEEP);
 @@ -1583,27 +1583,27 @@ scan_media(struct chfs_ebh *ebh)
 out_free:
 	mutex_exit(&ebh->erase_lock);
 	kmem_free(ebh->lmap, ebh->peb_nr * sizeof(int));
 	scan_info_destroy(si);
 	dbg_ebh("[SCAN_MEDIA] returning with error: %d\n", err);
 	return err;
+}
 /*****************************************************************************/
 /* End of Scan related operations					     */
 /*****************************************************************************/
 /**
- * ebh_open - opens mtd device and init ereaseblock header
+ * ebh_open - opens mtd device and init eraseblock header
  * @ebh: eraseblock handler
  * @flash_nr: flash device number to use
+ *
  * Returns zero in case of success, error code in case of fail.
  */
 int
 ebh_open(struct chfs_ebh *ebh, dev_t dev)
+{
 	int err;
 	ebh->flash_dev = flash_get_device(dev);
 	if (!ebh->flash_dev) {
 		aprint_error("ebh_open: cant get flash device\n");
 @@ -1988,48 +1988,48 @@ write_error:
 	if (err || CHFS_MAX_GET_PEB_RETRIES < ++retries) {
 		leb_write_unlock(ebh, lnr);
 		kmem_free(ebhdr, sizeof(struct chfs_eb_hdr));
 		return err;
+	}
 	goto retry;
+}
 /**
  * ebh_unmap_leb -
  * @ebh: eraseblock handler
  * @lnr: leb number
+ *
- * Retruns zero on success, error code in case of fail.
+ * Returns zero on success, error code in case of fail.
  */
 int
 ebh_unmap_leb(struct chfs_ebh *ebh, int lnr)
+{
 	int err;
 	if (ebh_is_mapped(ebh, lnr) < 0)
 		/* If the eraseblock already unmapped */
 		return 0;
 	err = ebh_erase_leb(ebh, lnr);
 	return err;
+}
 /**
  * ebh_is_mapped - check if a PEB is mapped to @lnr
  * @ebh: eraseblock handler
  * @lnr: leb number
+ *
- * Retruns 0 if the logical eraseblock is mapped, negative error code otherwise.
+ * Returns 0 if the logical eraseblock is mapped, negative error code otherwise.
  */
 int
 ebh_is_mapped(struct chfs_ebh *ebh, int lnr)
+{
 	int err, result;
 	err = leb_read_lock(ebh, lnr);
 	if (err)
 		return err;
 	result = ebh->lmap[lnr];
 	leb_read_unlock(ebh, lnr);
 	return result;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: list.c,v 1.28 2017/11/09 20:27:50 christos Exp $	*/
+/*	$NetBSD: list.c,v 1.29 2021/12/07 21:37:37 andvar Exp $	*/
 /*
  * Copyright (c) 1980, 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[] = "@(#)list.c	8.4 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: list.c,v 1.28 2017/11/09 20:27:50 christos Exp $");
+__RCSID("$NetBSD: list.c,v 1.29 2021/12/07 21:37:37 andvar Exp $");
 #endif
 #endif /* not lint */
 #include <assert.h>
 #include <regex.h>
 #include <util.h>
 #include "rcv.h"
 #include "extern.h"
 #include "format.h"
 #include "thread.h"
 #include "mime.h"
 @@ -936,27 +936,27 @@ check(int mesg, int f)
+}
 static int
 markall_core(int *markarray, char **bufp, int f, int level)
+{
 	enum token_e tok;
 	enum logic_op_e {
 		LOP_AND,
 		LOP_OR,
 		LOP_XOR
 	} logic_op;		/* binary logic operation */
 	int logic_invert;	/* invert the result */
-	int *tmparray;	/* temporarly array with result */
+	int *tmparray;	/* temporary array with result */
 	int msgCount;	/* tmparray length and message count */
 	int beg;	/* first value of a range */
 	int colmod;	/* the colon-modifier for this group */
 	int got_not;	/* for syntax checking of '!' */
 	int got_one;	/* we have a message spec, valid or not */
 	int got_bin;	/* we have a pending binary operation */
 	int i;
 	logic_op = LOP_OR;
 	logic_invert = 0;
 	colmod = 0;
 	msgCount = get_msgCount();

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: chfs_malloc.c,v 1.6 2019/06/17 17:14:56 ryoon Exp $ */	1	/* $NetBSD: chfs_malloc.c,v 1.7 2021/12/07 21:37:37 andvar Exp $ */
2		2
3	/*-	3	/*-
4	* Copyright (c) 2010 Department of Software Engineering,	4	* Copyright (c) 2010 Department of Software Engineering,
5	* University of Szeged, Hungary	5	* University of Szeged, Hungary
6	* Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>	6	* Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>
7	* Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>	7	* Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
8	* All rights reserved.	8	* All rights reserved.
9	*	9	*
10	* This code is derived from software contributed to The NetBSD Foundation	10	* This code is derived from software contributed to The NetBSD Foundation
11	* by the Department of Software Engineering, University of Szeged, Hungary	11	* by the Department of Software Engineering, University of Szeged, Hungary
12	*	12	*
13	* Redistribution and use in source and binary forms, with or without	13	* Redistribution and use in source and binary forms, with or without
14	* modification, are permitted provided that the following conditions	14	* modification, are permitted provided that the following conditions
	@@ -363,47 +363,47 @@ chfs_alloc_node_frag(void)		@@ -363,47 +363,47 @@ chfs_alloc_node_frag(void)
363	{	363	{
364	struct chfs_node_frag *ret;	364	struct chfs_node_frag *ret;
365	ret = pool_cache_get(chfs_node_frag_cache, PR_WAITOK);	365	ret = pool_cache_get(chfs_node_frag_cache, PR_WAITOK);
366	return ret;	366	return ret;
367	}	367	}
368		368
369	/* chfs_free_node_frag - freeing a fragment of a node */	369	/* chfs_free_node_frag - freeing a fragment of a node */
370	void	370	void
371	chfs_free_node_frag(struct chfs_node_frag *frag)	371	chfs_free_node_frag(struct chfs_node_frag *frag)
372	{	372	{
373	pool_cache_put(chfs_node_frag_cache, frag);	373	pool_cache_put(chfs_node_frag_cache, frag);
374	}	374	}
375		375
376	/* chfs_alloc_tmp_dnode - allocating a temporarly used dnode */	376	/* chfs_alloc_tmp_dnode - allocating a temporarily used dnode */
377	struct chfs_tmp_dnode *	377	struct chfs_tmp_dnode *
378	chfs_alloc_tmp_dnode(void)	378	chfs_alloc_tmp_dnode(void)
379	{	379	{
380	struct chfs_tmp_dnode *ret;	380	struct chfs_tmp_dnode *ret;
381	ret = pool_cache_get(chfs_tmp_dnode_cache, PR_WAITOK);	381	ret = pool_cache_get(chfs_tmp_dnode_cache, PR_WAITOK);
382	ret->next = NULL;	382	ret->next = NULL;
383	return ret;	383	return ret;
384	}	384	}
385		385
386	/* chfs_free_tmp_dnode - freeing a temporarly used dnode */	386	/* chfs_free_tmp_dnode - freeing a temporarily used dnode */
387	void	387	void
388	chfs_free_tmp_dnode(struct chfs_tmp_dnode *td)	388	chfs_free_tmp_dnode(struct chfs_tmp_dnode *td)
389	{	389	{
390	pool_cache_put(chfs_tmp_dnode_cache, td);	390	pool_cache_put(chfs_tmp_dnode_cache, td);
391	}	391	}
392		392
393	/* chfs_alloc_tmp_dnode_info - allocating a temporarly used dnode descriptor */	393	/* chfs_alloc_tmp_dnode_info - allocating a temporarily used dnode descriptor */
394	struct chfs_tmp_dnode_info *	394	struct chfs_tmp_dnode_info *
395	chfs_alloc_tmp_dnode_info(void)	395	chfs_alloc_tmp_dnode_info(void)
396	{	396	{
397	struct chfs_tmp_dnode_info *ret;	397	struct chfs_tmp_dnode_info *ret;
398	ret = pool_cache_get(chfs_tmp_dnode_info_cache, PR_WAITOK);	398	ret = pool_cache_get(chfs_tmp_dnode_info_cache, PR_WAITOK);
399	ret->tmpnode = NULL;	399	ret->tmpnode = NULL;
400	return ret;	400	return ret;
401	}	401	}
402		402
403	/* chfs_free_tmp_dnode_info - freeing a temporarly used dnode descriptor */	403	/* chfs_free_tmp_dnode_info - freeing a temporarily used dnode descriptor */
404	void	404	void
405	chfs_free_tmp_dnode_info(struct chfs_tmp_dnode_info *di)	405	chfs_free_tmp_dnode_info(struct chfs_tmp_dnode_info *di)
406	{	406	{
407	pool_cache_put(chfs_tmp_dnode_info_cache, di);	407	pool_cache_put(chfs_tmp_dnode_info_cache, di);
408	}	408	}
409		409

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: chfs_nodeops.c,v 1.4 2013/12/09 09:35:17 wiz Exp $ */	1	/* $NetBSD: chfs_nodeops.c,v 1.5 2021/12/07 21:37:37 andvar Exp $ */
2		2
3	/*-	3	/*-
4	* Copyright (c) 2010 Department of Software Engineering,	4	* Copyright (c) 2010 Department of Software Engineering,
5	* University of Szeged, Hungary	5	* University of Szeged, Hungary
6	* Copyright (C) 2010 David Tengeri <dtengeri@inf.u-szeged.hu>	6	* Copyright (C) 2010 David Tengeri <dtengeri@inf.u-szeged.hu>
7	* Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>	7	* Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>
8	* Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>	8	* Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
9	* All rights reserved.	9	* All rights reserved.
10	*	10	*
11	* This code is derived from software contributed to The NetBSD Foundation	11	* This code is derived from software contributed to The NetBSD Foundation
12	* by the Department of Software Engineering, University of Szeged, Hungary	12	* by the Department of Software Engineering, University of Szeged, Hungary
13	*	13	*
14	* Redistribution and use in source and binary forms, with or without	14	* Redistribution and use in source and binary forms, with or without
	@@ -196,27 +196,27 @@ chfs_add_fd_to_inode(struct chfs_mount *		@@ -196,27 +196,27 @@ chfs_add_fd_to_inode(struct chfs_mount *
196	chfs_remove_and_obsolete(chmp, parent->chvc, fd->nref,	196	chfs_remove_and_obsolete(chmp, parent->chvc, fd->nref,
197	&parent->chvc->dirents);	197	&parent->chvc->dirents);
198	mutex_exit(&chmp->chm_lock_vnocache);	198	mutex_exit(&chmp->chm_lock_vnocache);
199	}	199	}
200	chfs_free_dirent(fd);	200	chfs_free_dirent(fd);
201	} else {	201	} else {
202	/* new is older (normally it's not an option) */	202	/* new is older (normally it's not an option) */
203	chfs_mark_node_obsolete(chmp, new->nref);	203	chfs_mark_node_obsolete(chmp, new->nref);
204	chfs_free_dirent(new);	204	chfs_free_dirent(new);
205	}	205	}
206	return;	206	return;
207	}	207	}
208	}	208	}
209	/* if we couldnt fit it elsewhere, lets add to the end */	209	/* if we couldn't fit it elsewhere, lets add to the end */
210	/* FIXME insert tail or insert head? */	210	/* FIXME insert tail or insert head? */
211	TAILQ_INSERT_HEAD(&parent->dents, new, fds);	211	TAILQ_INSERT_HEAD(&parent->dents, new, fds);
212	}	212	}
213		213
214		214
215	/* chfs_add_vnode_ref_to_vc - adds a vnode info to the vnode cache */	215	/* chfs_add_vnode_ref_to_vc - adds a vnode info to the vnode cache */
216	void	216	void
217	chfs_add_vnode_ref_to_vc(struct chfs_mount *chmp,	217	chfs_add_vnode_ref_to_vc(struct chfs_mount *chmp,
218	struct chfs_vnode_cache vc, struct chfs_node_ref new)	218	struct chfs_vnode_cache vc, struct chfs_node_ref new)
219	{	219	{
220	KASSERT(mutex_owned(&chmp->chm_lock_vnocache));	220	KASSERT(mutex_owned(&chmp->chm_lock_vnocache));
221	struct chfs_node_ref *nref;	221	struct chfs_node_ref *nref;
222		222