Module Name: src
Committed By: riastradh
Date: Sun Apr 9 09:18:10 UTC 2023
Modified Files:
src/sys/kern: exec_subr.c kern_event.c kern_lwp.c kern_proc.c
kern_sig.c kern_sleepq.c kern_softint.c kern_sysctl.c
kern_turnstile.c kern_veriexec.c subr_asan.c subr_cpufreq.c
subr_kcpuset.c subr_pcu.c subr_pool.c subr_prf.c subr_time.c
subr_vmem.c subr_xcall.c sys_sched.c tty_ptm.c vfs_cache.c
vfs_lookup.c vfs_syscalls.c
Log Message:
kern: KASSERT(A && B) -> KASSERT(A); KASSERT(B)
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/kern/exec_subr.c
cvs rdiff -u -r1.146 -r1.147 src/sys/kern/kern_event.c
cvs rdiff -u -r1.251 -r1.252 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.269 -r1.270 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.404 -r1.405 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/kern_sleepq.c
cvs rdiff -u -r1.72 -r1.73 src/sys/kern/kern_softint.c
cvs rdiff -u -r1.268 -r1.269 src/sys/kern/kern_sysctl.c
cvs rdiff -u -r1.45 -r1.46 src/sys/kern/kern_turnstile.c \
src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/kern_veriexec.c
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/subr_asan.c src/sys/kern/subr_pcu.c
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/subr_cpufreq.c
cvs rdiff -u -r1.14 -r1.15 src/sys/kern/subr_kcpuset.c
cvs rdiff -u -r1.287 -r1.288 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.198 -r1.199 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/subr_time.c
cvs rdiff -u -r1.108 -r1.109 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/subr_xcall.c
cvs rdiff -u -r1.49 -r1.50 src/sys/kern/sys_sched.c
cvs rdiff -u -r1.152 -r1.153 src/sys/kern/vfs_cache.c
cvs rdiff -u -r1.232 -r1.233 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.557 -r1.558 src/sys/kern/vfs_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.84 src/sys/kern/exec_subr.c:1.85
--- src/sys/kern/exec_subr.c:1.84 Mon Apr 13 19:23:18 2020
+++ src/sys/kern/exec_subr.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_subr.c,v 1.84 2020/04/13 19:23:18 ad Exp $ */
+/* $NetBSD: exec_subr.c,v 1.85 2023/04/09 09:18:09 riastradh Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.84 2020/04/13 19:23:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.85 2023/04/09 09:18:09 riastradh Exp $");
#include "opt_pax.h"
@@ -460,7 +460,8 @@ exec_setup_stack(struct lwp *l, struct e
NEW_VMCMD2(&epp->ep_vmcmds, vmcmd_map_zero, noaccess_size,
noaccess_linear_min, NULL, 0, VM_PROT_NONE, VMCMD_STACK);
}
- KASSERT(access_size > 0 && access_size <= MAXSSIZ);
+ KASSERT(access_size > 0);
+ KASSERT(access_size <= MAXSSIZ);
NEW_VMCMD2(&epp->ep_vmcmds, vmcmd_map_zero, access_size,
access_linear_min, NULL, 0, VM_PROT_READ | VM_PROT_WRITE,
VMCMD_STACK);
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.146 src/sys/kern/kern_event.c:1.147
--- src/sys/kern/kern_event.c:1.146 Sun Jul 24 19:23:44 2022
+++ src/sys/kern/kern_event.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.146 2022/07/24 19:23:44 riastradh Exp $ */
+/* $NetBSD: kern_event.c,v 1.147 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009, 2021 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#endif /* _KERNEL_OPT */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.146 2022/07/24 19:23:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.147 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1400,7 +1400,8 @@ filt_timerexpire(void *knx)
kn->kn_data++;
knote_activate_locked(kn);
if (kn->kn_sdata != FILT_TIMER_NOSCHED) {
- KASSERT(kn->kn_sdata > 0 && kn->kn_sdata <= INT_MAX);
+ KASSERT(kn->kn_sdata > 0);
+ KASSERT(kn->kn_sdata <= INT_MAX);
callout_schedule((callout_t *)kn->kn_hook,
(int)kn->kn_sdata);
}
@@ -2448,8 +2449,8 @@ relock:
kn->kn_status &= ~KN_BUSY;
kq->kq_count--;
KASSERT(kn_in_flux(kn) == false);
- KASSERT((kn->kn_status & KN_WILLDETACH) != 0 &&
- kn->kn_kevent.udata == curlwp);
+ KASSERT((kn->kn_status & KN_WILLDETACH) != 0);
+ KASSERT(kn->kn_kevent.udata == curlwp);
mutex_spin_exit(&kq->kq_lock);
knote_detach(kn, fdp, true);
mutex_enter(&fdp->fd_lock);
Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.251 src/sys/kern/kern_lwp.c:1.252
--- src/sys/kern/kern_lwp.c:1.251 Fri Jul 1 01:06:04 2022
+++ src/sys/kern/kern_lwp.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.251 2022/07/01 01:06:04 riastradh Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.252 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020
@@ -217,7 +217,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.251 2022/07/01 01:06:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.252 2023/04/09 09:18:09 riastradh Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -1075,7 +1075,8 @@ lwp_exit(struct lwp *l)
current = (l == curlwp);
- KASSERT(current || (l->l_stat == LSIDL && l->l_target_cpu == NULL));
+ KASSERT(current || l->l_stat == LSIDL);
+ KASSERT(current || l->l_target_cpu == NULL);
KASSERT(p == curproc);
SDT_PROBE(proc, kernel, , lwp__exit, l, 0, 0, 0, 0);
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.269 src/sys/kern/kern_proc.c:1.270
--- src/sys/kern/kern_proc.c:1.269 Wed Oct 26 23:20:36 2022
+++ src/sys/kern/kern_proc.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.269 2022/10/26 23:20:36 riastradh Exp $ */
+/* $NetBSD: kern_proc.c,v 1.270 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.269 2022/10/26 23:20:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.270 2023/04/09 09:18:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -2044,7 +2044,8 @@ proc_active_lwp(struct proc *p)
struct lwp *l, *lp = NULL;
LIST_FOREACH(l, &p->p_lwps, l_sibling) {
- KASSERT(l->l_stat >= 0 && l->l_stat < __arraycount(ostat));
+ KASSERT(l->l_stat >= 0);
+ KASSERT(l->l_stat < __arraycount(ostat));
if (lp == NULL ||
ostat[l->l_stat] > ostat[lp->l_stat] ||
(ostat[l->l_stat] == ostat[lp->l_stat] &&
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.404 src/sys/kern/kern_sig.c:1.405
--- src/sys/kern/kern_sig.c:1.404 Sat Apr 9 23:38:33 2022
+++ src/sys/kern/kern_sig.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.404 2022/04/09 23:38:33 riastradh Exp $ */
+/* $NetBSD: kern_sig.c,v 1.405 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2019 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.404 2022/04/09 23:38:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.405 2023/04/09 09:18:09 riastradh Exp $");
#include "opt_execfmt.h"
#include "opt_ptrace.h"
@@ -1316,7 +1316,8 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
KASSERT(mutex_owned(&proc_lock));
KASSERT(mutex_owned(p->p_lock));
KASSERT((ksi->ksi_flags & KSI_QUEUED) == 0);
- KASSERT(signo > 0 && signo < NSIG);
+ KASSERT(signo > 0);
+ KASSERT(signo < NSIG);
/*
* If the process is being created by fork, is a zombie or is
@@ -1571,7 +1572,8 @@ proc_stop_done(struct proc *p, int ppmas
KASSERT(mutex_owned(&proc_lock));
KASSERT(mutex_owned(p->p_lock));
KASSERT((p->p_sflag & PS_STOPPING) != 0);
- KASSERT(p->p_nrlwps == 0 || (p->p_nrlwps == 1 && p == curproc));
+ KASSERT(p->p_nrlwps == 0 || p->p_nrlwps == 1);
+ KASSERT(p->p_nrlwps == 0 || p == curproc);
p->p_sflag &= ~PS_STOPPING;
p->p_stat = SSTOP;
Index: src/sys/kern/kern_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.73 src/sys/kern/kern_sleepq.c:1.74
--- src/sys/kern/kern_sleepq.c:1.73 Wed Jun 29 22:27:01 2022
+++ src/sys/kern/kern_sleepq.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sleepq.c,v 1.73 2022/06/29 22:27:01 riastradh Exp $ */
+/* $NetBSD: kern_sleepq.c,v 1.74 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.73 2022/06/29 22:27:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.74 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -225,7 +225,8 @@ sleepq_enqueue(sleepq_t *sq, wchan_t wch
KASSERT(lwp_locked(l, NULL));
KASSERT(l->l_stat == LSONPROC);
- KASSERT(l->l_wchan == NULL && l->l_sleepq == NULL);
+ KASSERT(l->l_wchan == NULL);
+ KASSERT(l->l_sleepq == NULL);
KASSERT((l->l_flag & LW_SINTR) == 0);
l->l_syncobj = sobj;
Index: src/sys/kern/kern_softint.c
diff -u src/sys/kern/kern_softint.c:1.72 src/sys/kern/kern_softint.c:1.73
--- src/sys/kern/kern_softint.c:1.72 Fri Oct 28 21:52:02 2022
+++ src/sys/kern/kern_softint.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_softint.c,v 1.72 2022/10/28 21:52:02 riastradh Exp $ */
+/* $NetBSD: kern_softint.c,v 1.73 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.72 2022/10/28 21:52:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.73 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -433,7 +433,8 @@ softint_disestablish(void *arg)
uintptr_t offset;
offset = (uintptr_t)arg;
- KASSERTMSG(offset != 0 && offset < softint_bytes, "%"PRIuPTR" %u",
+ KASSERT(offset != 0);
+ KASSERTMSG(offset < softint_bytes, "%"PRIuPTR" %u",
offset, softint_bytes);
/*
@@ -496,7 +497,8 @@ softint_schedule(void *arg)
/* Find the handler record for this CPU. */
offset = (uintptr_t)arg;
- KASSERTMSG(offset != 0 && offset < softint_bytes, "%"PRIuPTR" %u",
+ KASSERT(offset != 0);
+ KASSERTMSG(offset < softint_bytes, "%"PRIuPTR" %u",
offset, softint_bytes);
sh = (softhand_t *)((uint8_t *)curcpu()->ci_data.cpu_softcpu + offset);
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.268 src/sys/kern/kern_sysctl.c:1.269
--- src/sys/kern/kern_sysctl.c:1.268 Fri Feb 17 06:20:31 2023
+++ src/sys/kern/kern_sysctl.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.268 2023/02/17 06:20:31 skrll Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.269 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
#define __COMPAT_SYSCTL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.268 2023/02/17 06:20:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.269 2023/04/09 09:18:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_defcorename.h"
@@ -2517,9 +2517,9 @@ sysctl_teardown(struct sysctllog **logp)
memset(&node, 0, sizeof(node));
while (log->log_left < log->log_size) {
- KASSERT((log->log_left + 3 < log->log_size) &&
- (log->log_left + log->log_num[log->log_left + 2] <=
- log->log_size));
+ KASSERT(log->log_left + 3 < log->log_size);
+ KASSERT(log->log_left + log->log_num[log->log_left + 2] <=
+ log->log_size);
v = log->log_num[log->log_left++];
t = log->log_num[log->log_left++];
namelen = log->log_num[log->log_left++];
Index: src/sys/kern/kern_turnstile.c
diff -u src/sys/kern/kern_turnstile.c:1.45 src/sys/kern/kern_turnstile.c:1.46
--- src/sys/kern/kern_turnstile.c:1.45 Wed Oct 26 23:27:16 2022
+++ src/sys/kern/kern_turnstile.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_turnstile.c,v 1.45 2022/10/26 23:27:16 riastradh Exp $ */
+/* $NetBSD: kern_turnstile.c,v 1.46 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2009, 2019, 2020
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.45 2022/10/26 23:27:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.46 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/lockdebug.h>
@@ -385,7 +385,8 @@ turnstile_block(turnstile_t *ts, int q,
KASSERT(q == TS_READER_Q || q == TS_WRITER_Q);
KASSERT(mutex_owned(lock));
- KASSERT(l != NULL && l->l_ts != NULL);
+ KASSERT(l != NULL);
+ KASSERT(l->l_ts != NULL);
if (ts == NULL) {
/*
@@ -394,8 +395,8 @@ turnstile_block(turnstile_t *ts, int q,
*/
ts = l->l_ts;
KASSERT(TS_ALL_WAITERS(ts) == 0);
- KASSERT(LIST_EMPTY(&ts->ts_sleepq[TS_READER_Q]) &&
- LIST_EMPTY(&ts->ts_sleepq[TS_WRITER_Q]));
+ KASSERT(LIST_EMPTY(&ts->ts_sleepq[TS_READER_Q]));
+ KASSERT(LIST_EMPTY(&ts->ts_sleepq[TS_WRITER_Q]));
ts->ts_obj = obj;
ts->ts_inheritor = NULL;
LIST_INSERT_HEAD(tc, ts, ts_chain);
@@ -459,7 +460,8 @@ turnstile_wakeup(turnstile_t *ts, int q,
sq = &ts->ts_sleepq[q];
KASSERT(q == TS_READER_Q || q == TS_WRITER_Q);
- KASSERT(count > 0 && count <= TS_WAITERS(ts, q));
+ KASSERT(count > 0);
+ KASSERT(count <= TS_WAITERS(ts, q));
KASSERT(mutex_owned(lock));
KASSERT(ts->ts_inheritor == curlwp || ts->ts_inheritor == NULL);
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.45 src/sys/kern/tty_ptm.c:1.46
--- src/sys/kern/tty_ptm.c:1.45 Thu Sep 29 12:18:27 2022
+++ src/sys/kern/tty_ptm.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.45 2022/09/29 12:18:27 christos Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.46 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2004, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.45 2022/09/29 12:18:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.46 2023/04/09 09:18:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -142,7 +142,8 @@ pty_vn_open(struct vnode *vp, struct lwp
if (error) {
/* only ptys mean we can't get these */
- KASSERT(error != EDUPFD && error != EMOVEFD);
+ KASSERT(error != EDUPFD);
+ KASSERT(error != EMOVEFD);
vput(vp);
return error;
}
Index: src/sys/kern/kern_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.26 src/sys/kern/kern_veriexec.c:1.27
--- src/sys/kern/kern_veriexec.c:1.26 Thu Jun 11 02:30:21 2020
+++ src/sys/kern/kern_veriexec.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_veriexec.c,v 1.26 2020/06/11 02:30:21 thorpej Exp $ */
+/* $NetBSD: kern_veriexec.c,v 1.27 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.26 2020/06/11 02:30:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.27 2023/04/09 09:18:09 riastradh Exp $");
#include "opt_veriexec.h"
@@ -230,8 +230,11 @@ veriexec_fpops_add(const char *fp_type,
{
struct veriexec_fpops *ops;
- KASSERT((init != NULL) && (update != NULL) && (final != NULL));
- KASSERT((hash_len != 0) && (ctx_size != 0));
+ KASSERT(init != NULL);
+ KASSERT(update != NULL);
+ KASSERT(final != NULL);
+ KASSERT(hash_len != 0);
+ KASSERT(ctx_size != 0);
KASSERT(fp_type != NULL);
if (veriexec_fpops_lookup(fp_type) != NULL)
Index: src/sys/kern/subr_asan.c
diff -u src/sys/kern/subr_asan.c:1.27 src/sys/kern/subr_asan.c:1.28
--- src/sys/kern/subr_asan.c:1.27 Fri Dec 18 15:33:34 2020
+++ src/sys/kern/subr_asan.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_asan.c,v 1.27 2020/12/18 15:33:34 martin Exp $ */
+/* $NetBSD: subr_asan.c,v 1.28 2023/04/09 09:18:09 riastradh Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.27 2020/12/18 15:33:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.28 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -115,7 +115,8 @@ kasan_shadow_map(void *addr, size_t size
npages = (eva - sva) / PAGE_SIZE;
- KASSERT(sva >= KASAN_MD_SHADOW_START && eva < KASAN_MD_SHADOW_END);
+ KASSERT(sva >= KASAN_MD_SHADOW_START);
+ KASSERT(eva < KASAN_MD_SHADOW_END);
for (i = 0; i < npages; i++) {
kasan_md_shadow_map_page(sva + i * PAGE_SIZE);
Index: src/sys/kern/subr_pcu.c
diff -u src/sys/kern/subr_pcu.c:1.27 src/sys/kern/subr_pcu.c:1.28
--- src/sys/kern/subr_pcu.c:1.27 Wed Oct 26 23:38:57 2022
+++ src/sys/kern/subr_pcu.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pcu.c,v 1.27 2022/10/26 23:38:57 riastradh Exp $ */
+/* $NetBSD: subr_pcu.c,v 1.28 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2011, 2014 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pcu.c,v 1.27 2022/10/26 23:38:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pcu.c,v 1.28 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -308,7 +308,8 @@ pcu_load(const pcu_ops_t *pcu)
struct cpu_info *ci, *curci;
int s;
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
s = splpcu();
curci = curcpu();
@@ -378,7 +379,8 @@ pcu_discard(const pcu_ops_t *pcu, lwp_t
{
const u_int id = pcu->pcu_id;
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
if (__predict_false(valid)) {
l->l_pcu_valid |= (1U << id);
@@ -399,7 +401,8 @@ pcu_save(const pcu_ops_t *pcu, lwp_t *l)
{
const u_int id = pcu->pcu_id;
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
if (__predict_true(l->l_pcu_cpu[id] == NULL)) {
return;
Index: src/sys/kern/subr_cpufreq.c
diff -u src/sys/kern/subr_cpufreq.c:1.9 src/sys/kern/subr_cpufreq.c:1.10
--- src/sys/kern/subr_cpufreq.c:1.9 Wed Feb 12 20:20:15 2014
+++ src/sys/kern/subr_cpufreq.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cpufreq.c,v 1.9 2014/02/12 20:20:15 martin Exp $ */
+/* $NetBSD: subr_cpufreq.c,v 1.10 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cpufreq.c,v 1.9 2014/02/12 20:20:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cpufreq.c,v 1.10 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -378,7 +378,8 @@ cpufreq_get_state_raw(uint32_t freq, str
uint32_t f, hi, i = 0, lo = 0;
KASSERT(mutex_owned(&cpufreq_lock) != 0);
- KASSERT(cf->cf_init != false && cfs != NULL);
+ KASSERT(cf->cf_init != false);
+ KASSERT(cfs != NULL);
hi = cf->cf_state_count;
Index: src/sys/kern/subr_kcpuset.c
diff -u src/sys/kern/subr_kcpuset.c:1.14 src/sys/kern/subr_kcpuset.c:1.15
--- src/sys/kern/subr_kcpuset.c:1.14 Sat Apr 9 23:38:33 2022
+++ src/sys/kern/subr_kcpuset.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kcpuset.c,v 1.14 2022/04/09 23:38:33 riastradh Exp $ */
+/* $NetBSD: subr_kcpuset.c,v 1.15 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.14 2022/04/09 23:38:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.15 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -114,7 +114,8 @@ kcpuset_sysinit(void)
/* Set a kcpuset_t sizes. */
kc_nfields = (KC_MAXCPUS >> KC_SHIFT);
kc_bitsize = sizeof(uint32_t) * kc_nfields;
- KASSERT(kc_nfields != 0 && kc_bitsize != 0);
+ KASSERT(kc_nfields != 0);
+ KASSERT(kc_bitsize != 0);
kc_cache = pool_cache_init(sizeof(kcpuset_impl_t) + kc_bitsize,
coherency_unit, 0, 0, "kcpuset", NULL, IPL_NONE, NULL, NULL, NULL);
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.287 src/sys/kern/subr_pool.c:1.288
--- src/sys/kern/subr_pool.c:1.287 Fri Feb 24 11:02:27 2023
+++ src/sys/kern/subr_pool.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.287 2023/02/24 11:02:27 riastradh Exp $ */
+/* $NetBSD: subr_pool.c,v 1.288 2023/04/09 09:18:09 riastradh Exp $ */
/*
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018,
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.287 2023/02/24 11:02:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.288 2023/04/09 09:18:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1653,7 +1653,8 @@ pool_reclaim(struct pool *pp)
bool klock;
int rv;
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
if (pp->pr_drain_hook != NULL) {
/*
@@ -2407,7 +2408,8 @@ pool_cache_invalidate(pool_cache_t pc)
pcg_t *pcg;
int n, s;
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
if (ncpu < 2 || !mp_online) {
/*
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.198 src/sys/kern/subr_prf.c:1.199
--- src/sys/kern/subr_prf.c:1.198 Tue Feb 7 09:25:51 2023
+++ src/sys/kern/subr_prf.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.198 2023/02/07 09:25:51 macallan Exp $ */
+/* $NetBSD: subr_prf.c,v 1.199 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.198 2023/02/07 09:25:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.199 2023/04/09 09:18:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -146,7 +146,8 @@ void
kprintf_init(void)
{
- KASSERT(!kprintf_inited && cold); /* not foolproof, but ... */
+ KASSERT(!kprintf_inited); /* not foolproof, but ... */
+ KASSERT(cold);
mutex_init(&kprintf_mtx, MUTEX_DEFAULT, IPL_HIGH);
#ifdef RND_PRINTF
rnd_attach_source(&rnd_printf_source, "printf", RND_TYPE_UNKNOWN,
Index: src/sys/kern/subr_time.c
diff -u src/sys/kern/subr_time.c:1.35 src/sys/kern/subr_time.c:1.36
--- src/sys/kern/subr_time.c:1.35 Tue Jun 28 02:04:51 2022
+++ src/sys/kern/subr_time.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.35 2022/06/28 02:04:51 riastradh Exp $ */
+/* $NetBSD: subr_time.c,v 1.36 2023/04/09 09:18:09 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.35 2022/06/28 02:04:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.36 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -98,7 +98,8 @@ tvtohz(const struct timeval *tv)
sec = tv->tv_sec;
usec = tv->tv_usec;
- KASSERT(usec >= 0 && usec < 1000000);
+ KASSERT(usec >= 0);
+ KASSERT(usec < 1000000);
/* catch overflows in conversion time_t->int */
if (tv->tv_sec > INT_MAX)
Index: src/sys/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.108 src/sys/kern/subr_vmem.c:1.109
--- src/sys/kern/subr_vmem.c:1.108 Tue May 31 08:43:16 2022
+++ src/sys/kern/subr_vmem.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.108 2022/05/31 08:43:16 andvar Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.109 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.108 2022/05/31 08:43:16 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.109 2023/04/09 09:18:09 riastradh Exp $");
#if defined(_KERNEL) && defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -391,7 +391,8 @@ bt_freehead_tofree(vmem_t *vm, vmem_size
const vmem_size_t qsize = size >> vm->vm_quantum_shift;
const int idx = SIZE2ORDER(qsize);
- KASSERT(size != 0 && qsize != 0);
+ KASSERT(size != 0);
+ KASSERT(qsize != 0);
KASSERT((size & vm->vm_quantum_mask) == 0);
KASSERT(idx >= 0);
KASSERT(idx < VMEM_MAXORDER);
@@ -414,7 +415,8 @@ bt_freehead_toalloc(vmem_t *vm, vmem_siz
const vmem_size_t qsize = size >> vm->vm_quantum_shift;
int idx = SIZE2ORDER(qsize);
- KASSERT(size != 0 && qsize != 0);
+ KASSERT(size != 0);
+ KASSERT(qsize != 0);
KASSERT((size & vm->vm_quantum_mask) == 0);
if (strat == VM_INSTANTFIT && ORDER2SIZE(idx) != qsize) {
@@ -1131,7 +1133,8 @@ vmem_xalloc(vmem_t *vm, const vmem_size_
KASSERT((phase & vm->vm_quantum_mask) == 0);
KASSERT((nocross & vm->vm_quantum_mask) == 0);
KASSERT((nocross & (nocross - 1)) == 0);
- KASSERT((align == 0 && phase == 0) || phase < align);
+ KASSERT(align == 0 || phase < align);
+ KASSERT(phase == 0 || phase < align);
KASSERT(nocross == 0 || nocross >= size);
KASSERT(minaddr <= maxaddr);
KASSERT(!VMEM_CROSS_P(phase, phase + size - 1, nocross));
Index: src/sys/kern/subr_xcall.c
diff -u src/sys/kern/subr_xcall.c:1.34 src/sys/kern/subr_xcall.c:1.35
--- src/sys/kern/subr_xcall.c:1.34 Tue Dec 22 01:57:29 2020
+++ src/sys/kern/subr_xcall.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_xcall.c,v 1.34 2020/12/22 01:57:29 ad Exp $ */
+/* $NetBSD: subr_xcall.c,v 1.35 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2007-2010, 2019 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.34 2020/12/22 01:57:29 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.35 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -257,7 +257,8 @@ uint64_t
xc_broadcast(unsigned int flags, xcfunc_t func, void *arg1, void *arg2)
{
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
ASSERT_SLEEPABLE();
if (__predict_false(!mp_online)) {
@@ -306,7 +307,8 @@ xc_unicast(unsigned int flags, xcfunc_t
int s;
KASSERT(ci != NULL);
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
ASSERT_SLEEPABLE();
if (__predict_false(!mp_online)) {
@@ -335,7 +337,8 @@ xc_wait(uint64_t where)
{
xc_state_t *xc;
- KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+ KASSERT(!cpu_intr_p());
+ KASSERT(!cpu_softintr_p());
ASSERT_SLEEPABLE();
if (__predict_false(!mp_online)) {
Index: src/sys/kern/sys_sched.c
diff -u src/sys/kern/sys_sched.c:1.49 src/sys/kern/sys_sched.c:1.50
--- src/sys/kern/sys_sched.c:1.49 Sat May 23 23:42:43 2020
+++ src/sys/kern/sys_sched.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sched.c,v 1.49 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: sys_sched.c,v 1.50 2023/04/09 09:18:09 riastradh Exp $ */
/*
* Copyright (c) 2008, 2011 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.49 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.50 2023/04/09 09:18:09 riastradh Exp $");
#include <sys/param.h>
@@ -73,7 +73,8 @@ convert_pri(lwp_t *l, int policy, pri_t
/* Convert user priority to the in-kernel */
if (pri != PRI_NONE) {
/* Only for real-time threads */
- KASSERT(pri >= SCHED_PRI_MIN && pri <= SCHED_PRI_MAX);
+ KASSERT(pri >= SCHED_PRI_MIN);
+ KASSERT(pri <= SCHED_PRI_MAX);
KASSERT(policy != SCHED_OTHER);
return PRI_USER_RT + pri;
}
Index: src/sys/kern/vfs_cache.c
diff -u src/sys/kern/vfs_cache.c:1.152 src/sys/kern/vfs_cache.c:1.153
--- src/sys/kern/vfs_cache.c:1.152 Mon Nov 1 21:28:03 2021
+++ src/sys/kern/vfs_cache.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.152 2021/11/01 21:28:03 andvar Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.153 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -172,7 +172,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.152 2021/11/01 21:28:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.153 2023/04/09 09:18:09 riastradh Exp $");
#define __NAMECACHE_PRIVATE
#ifdef _KERNEL_OPT
@@ -700,7 +700,8 @@ cache_lookup_linked(struct vnode *dvp, c
}
return false;
}
- KASSERT(dvi->vi_nc_uid != VNOVAL && dvi->vi_nc_gid != VNOVAL);
+ KASSERT(dvi->vi_nc_uid != VNOVAL);
+ KASSERT(dvi->vi_nc_gid != VNOVAL);
error = kauth_authorize_vnode(cred,
KAUTH_ACCESS_ACTION(VEXEC,
dvp->v_type, dvi->vi_nc_mode & ALLPERMS), dvp, NULL,
@@ -730,7 +731,8 @@ cache_lookup_linked(struct vnode *dvp, c
}
if (ncp->nc_vp == NULL) {
/* found negative entry; vn is already null from above */
- KASSERT(namelen != cache_mp_nlen && name != cache_mp_name);
+ KASSERT(namelen != cache_mp_nlen);
+ KASSERT(name != cache_mp_name);
COUNT(ncs_neghits);
} else {
COUNT(ncs_goodhits); /* XXX can be "badhits" */
@@ -796,7 +798,8 @@ cache_revlookup(struct vnode *vp, struct
rw_exit(&vi->vi_nc_listlock);
return -1;
}
- KASSERT(vi->vi_nc_uid != VNOVAL && vi->vi_nc_gid != VNOVAL);
+ KASSERT(vi->vi_nc_uid != VNOVAL);
+ KASSERT(vi->vi_nc_gid != VNOVAL);
error = kauth_authorize_vnode(kauth_cred_get(),
KAUTH_ACCESS_ACTION(VEXEC, vp->v_type, vi->vi_nc_mode &
ALLPERMS), vp, NULL, genfs_can_access(vp, curlwp->l_cred,
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.232 src/sys/kern/vfs_lookup.c:1.233
--- src/sys/kern/vfs_lookup.c:1.232 Mon Aug 22 09:14:59 2022
+++ src/sys/kern/vfs_lookup.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.232 2022/08/22 09:14:59 hannken Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.233 2023/04/09 09:18:09 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.232 2022/08/22 09:14:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.233 2023/04/09 09:18:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -1328,7 +1328,8 @@ lookup_fastforward(struct namei_state *s
error = EOPNOTSUPP;
break;
}
- KASSERT(plock != NULL && rw_lock_held(plock));
+ KASSERT(plock != NULL);
+ KASSERT(rw_lock_held(plock));
/*
* Scored a hit. Negative is good too (ENOENT). If there's
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.557 src/sys/kern/vfs_syscalls.c:1.558
--- src/sys/kern/vfs_syscalls.c:1.557 Sun Mar 5 14:40:32 2023
+++ src/sys/kern/vfs_syscalls.c Sun Apr 9 09:18:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.557 2023/03/05 14:40:32 riastradh Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.558 2023/04/09 09:18:09 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.557 2023/03/05 14:40:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.558 2023/04/09 09:18:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1947,8 +1947,8 @@ vfs_composefh_alloc(struct vnode *vp, fh
fhp->fh_fsid = mp->mnt_stat.f_fsidx;
error = VFS_VPTOFH(vp, &fhp->fh_fid, &fidsize);
if (error == 0) {
- KASSERT((FHANDLE_SIZE(fhp) == fhsize &&
- FHANDLE_FILEID(fhp)->fid_len == fidsize));
+ KASSERT(FHANDLE_SIZE(fhp) == fhsize);
+ KASSERT(FHANDLE_FILEID(fhp)->fid_len == fidsize);
*fhpp = fhp;
} else {
kmem_free(fhp, fhsize);
@@ -4374,7 +4374,8 @@ do_sys_renameat(struct lwp *l, int fromf
struct mount *mp, *tmp;
int error;
- KASSERT(l != NULL || (fromfd == AT_FDCWD && tofd == AT_FDCWD));
+ KASSERT(l != NULL || fromfd == AT_FDCWD);
+ KASSERT(l != NULL || tofd == AT_FDCWD);
error = pathbuf_maybe_copyin(from, seg, &fpb);
if (error)
