=== DF-0807 Phase 8 fix validation ===
Mon Jul  6 17:51:14 UTC 2026

=== (0) set up kernel include aliases for <machine/*> =============
machine alias: /tmp/kerninc/machine -> /usr/src/sys/platform/vkernel64/include
vkernel64 smp.h reachable

=== (2) apply fix.diff to /usr/src ===
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/vfs/dirfs/dirfs_vnops.c b/sys/vfs/dirfs/dirfs_vnops.c
|--- a/sys/vfs/dirfs/dirfs_vnops.c
|+++ b/sys/vfs/dirfs/dirfs_vnops.c
--------------------------
Patching file sys/vfs/dirfs/dirfs_vnops.c using Plan A...
Ignoring previously applied (or reversed) patch.
Hunk #1 ignored at 1281.
1 out of 1 hunks ignored--saving rejects to sys/vfs/dirfs/dirfs_vnops.c.rej
done
--- patched region (lines 1277-1286) ---
	for (dp = (struct dirent *)buf; bytes > 0 && uio->uio_resid > 0;
	    bytes -= _DIRENT_DIRSIZ(dp), dp = dpn) {
		r = vop_write_dirent(&error, uio, dp->d_ino, dp->d_type,
		    dp->d_namlen, dp->d_name);
		if (error || r)
			break;
		dpn = _DIRENT_NEXT(dp);
		cnt++;
	}
	curoff = lseek(dnp->dn_fd, 0, SEEK_CUR);

=== (3b) compile PATCHED dirfs_vnops.c ===
--- PATCHED compile errors (sorted unique) ---
/usr/include/cpu/cpufunc.h:269:1: error: static declaration of 'ffs' follows non-static declaration
/usr/include/cpu/cpufunc.h:277:1: error: static declaration of 'ffsl' follows non-static declaration
/usr/include/cpu/cpufunc.h:285:1: error: static declaration of 'fls' follows non-static declaration
/usr/include/cpu/cpufunc.h:293:1: error: static declaration of 'flsl' follows non-static declaration
/usr/include/cpu/cpufunc.h:301:1: error: static declaration of 'flsll' follows non-static declaration
/usr/src/sys/sys/ktr.h:47:10: fatal error: opt_ktr.h: No such file or directory
--- error count: 6 ---

=== (3c) revert fix, compile UNPATCHED dirfs_vnops.c ===
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/vfs/dirfs/dirfs_vnops.c b/sys/vfs/dirfs/dirfs_vnops.c
|--- a/sys/vfs/dirfs/dirfs_vnops.c
|+++ b/sys/vfs/dirfs/dirfs_vnops.c
--------------------------
Patching file sys/vfs/dirfs/dirfs_vnops.c using Plan A...
Hunk #1 succeeded at 1281.
done
--- unpatched region (lines 1277-1286) ---
	for (dp = (struct dirent *)buf; bytes > 0 && uio->uio_resid > 0;
	    bytes -= _DIRENT_DIRSIZ(dp), dp = dpn) {
		r = vop_write_dirent(&error, uio, dp->d_ino, dp->d_type,
		    dp->d_namlen, dp->d_name);
		if (error || r)
			break;
		dpn = _DIRENT_NEXT(dp);
		dp = dpn;
		cnt++;
	}
--- UNPATCHED compile errors (sorted unique) ---
/usr/include/cpu/cpufunc.h:269:1: error: static declaration of 'ffs' follows non-static declaration
/usr/include/cpu/cpufunc.h:277:1: error: static declaration of 'ffsl' follows non-static declaration
/usr/include/cpu/cpufunc.h:285:1: error: static declaration of 'fls' follows non-static declaration
/usr/include/cpu/cpufunc.h:293:1: error: static declaration of 'flsl' follows non-static declaration
/usr/include/cpu/cpufunc.h:301:1: error: static declaration of 'flsll' follows non-static declaration
/usr/src/sys/sys/ktr.h:47:10: fatal error: opt_ktr.h: No such file or directory
--- error count: 6 ---

=== (3d) error-set diff (PATCHED vs UNPATCHED) ===
IDENTICAL error sets -- fix introduces ZERO new compile errors
--- line counts: patched=       6 unpatched=       6 ---

=== (3e) re-apply fix to leave /usr/src patched ===
fix NOT applied -- applying now
Patching file sys/vfs/dirfs/dirfs_vnops.c using Plan A...
Hunk #1 succeeded at 1281.
done
--- final patched region (lines 1277-1286) ---
	for (dp = (struct dirent *)buf; bytes > 0 && uio->uio_resid > 0;
	    bytes -= _DIRENT_DIRSIZ(dp), dp = dpn) {
		r = vop_write_dirent(&error, uio, dp->d_ino, dp->d_type,
		    dp->d_namlen, dp->d_name);
		if (error || r)
			break;
		dpn = _DIRENT_NEXT(dp);
		cnt++;
	}
	curoff = lseek(dnp->dn_fd, 0, SEEK_CUR);
--- content verification: 'dp = dpn' in loop body? ---
ABSENT (fix correctly applied)

=== Phase 8 done ===
Mon Jul  6 17:51:14 UTC 2026