Module Name: src Committed By: andvar Date: Wed Jan 8 11:39:50 UTC 2025
Modified Files: src/sys/dev/flash: flash_io.c src/sys/ufs/chfs: ebh.c ebh.h Log Message: s/eraseing/erasing/ and couple more typos in debug messages and comments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/flash/flash_io.c cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/chfs/ebh.c cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/ebh.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/flash/flash_io.c diff -u src/sys/dev/flash/flash_io.c:1.6 src/sys/dev/flash/flash_io.c:1.7 --- src/sys/dev/flash/flash_io.c:1.6 Mon Apr 3 18:03:23 2023 +++ src/sys/dev/flash/flash_io.c Wed Jan 8 11:39:50 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: flash_io.c,v 1.6 2023/04/03 18:03:23 gutteridge Exp $ */ +/* $NetBSD: flash_io.c,v 1.7 2025/01/08 11:39:50 andvar Exp $ */ /*- * Copyright (c) 2011 Department of Software Engineering, @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.6 2023/04/03 18:03:23 gutteridge Exp $"); +__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.7 2025/01/08 11:39:50 andvar Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -243,7 +243,7 @@ flash_io_cache_sync(struct flash_io *fio base = fio->fio_block * fio->fio_if->erasesize; - FLDPRINTF(("eraseing block at 0x%jx\n", (uintmax_t )base)); + FLDPRINTF(("erasing block at 0x%jx\n", (uintmax_t )base)); ei.ei_addr = base; ei.ei_len = fio->fio_if->erasesize; ei.ei_callback = NULL; Index: src/sys/ufs/chfs/ebh.c diff -u src/sys/ufs/chfs/ebh.c:1.10 src/sys/ufs/chfs/ebh.c:1.11 --- src/sys/ufs/chfs/ebh.c:1.10 Fri Dec 30 09:08:48 2022 +++ src/sys/ufs/chfs/ebh.c Wed Jan 8 11:39:50 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: ebh.c,v 1.10 2022/12/30 09:08:48 andvar Exp $ */ +/* $NetBSD: ebh.c,v 1.11 2025/01/08 11:39:50 andvar Exp $ */ /*- * Copyright (c) 2010 Department of Software Engineering, @@ -949,7 +949,7 @@ free_peb(struct chfs_ebh *ebh) goto out_free; } /* Erase PEB */ - //dbg_ebh("[FREE PEB] eraseing a block\n"); + //dbg_ebh("[FREE PEB] erasing a block\n"); peb = TAILQ_FIRST(&ebh->to_erase); TAILQ_REMOVE(&ebh->to_erase, peb, u.queue); mutex_exit(&ebh->erase_lock); Index: src/sys/ufs/chfs/ebh.h diff -u src/sys/ufs/chfs/ebh.h:1.4 src/sys/ufs/chfs/ebh.h:1.5 --- src/sys/ufs/chfs/ebh.h:1.4 Sat Aug 6 20:42:29 2016 +++ src/sys/ufs/chfs/ebh.h Wed Jan 8 11:39:50 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: ebh.h,v 1.4 2016/08/06 20:42:29 dholland Exp $ */ +/* $NetBSD: ebh.h,v 1.5 2025/01/08 11:39:50 andvar Exp $ */ /*- * Copyright (c) 2010 Department of Software Engineering, @@ -123,7 +123,7 @@ RB_HEAD(ltree_rbtree, chfs_ltree_entry); /** - * struct chfs_scan_leb - scanning infomration about a physical eraseblock + * struct chfs_scan_leb - scanning information about a physical eraseblock * @erase_cnt: erase counter * @pebnr: physical eraseblock number * @info: the status of the PEB's eraseblock header when NOR serial when NAND @@ -254,13 +254,13 @@ struct erase_thread { * @ltree: the lock tree * @ltree_lock: protects the tree * @alc_mutex: serializes "atomic LEB change" operation - * @free: RB-tree of the free easeblocks + * @free: RB-tree of the free eraseblocks * @in_use: RB-tree of PEBs are in use * @to_erase: list of the PEBs waiting for erase * @fully_erased: list of PEBs that have been erased but don't have header * @erase_lock: list and tree lock for fully_erased and to_erase lists and * for the free RB-tree - * @bg_erase: background thread for eraseing PEBs. + * @bg_erase: background thread for erasing PEBs. * @ops: collection of operations which depends on flash type * @max_serial: max serial number of eraseblocks, only used on NAND */