diff --git a/MAINTAINERS b/MAINTAINERS index 8c3c798c256c..ea9bb4195aa1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -54,7 +54,7 @@ contrib/pjdfstest asomers,ngie,pjd,#test Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. fetch des Pre-commit review requested, email only. -fusefs(5) asomers Pre-commit review requested. +fusefs(4) asomers Pre-commit review requested. geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org @@ -121,7 +121,7 @@ libvmmapi jhb Pre-commit review requested via #bhyve phabricator group. usr.sbin/bhyve* jhb Pre-commit review requested via #bhyve phabricator group. -autofs(5) trasz Pre-commit review recommended. +autofs(4) trasz Pre-commit review recommended. iscsi(4) trasz Pre-commit review recommended. rctl(8) trasz Pre-commit review recommended. sys/dev/ofw nwhitehorn Pre-commit review recommended. diff --git a/contrib/netbsd-tests/lib/libc/sys/t_revoke.c b/contrib/netbsd-tests/lib/libc/sys/t_revoke.c index ec225b9be491..73cb9144f680 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_revoke.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_revoke.c @@ -59,7 +59,7 @@ ATF_TC_BODY(revoke_basic, tc) int *buf; #ifdef __FreeBSD__ - atf_tc_skip("revoke(2) is only implemented for devfs(5)."); + atf_tc_skip("revoke(2) is only implemented for devfs(4)."); #endif (void)memset(&res, 0, sizeof(struct rlimit)); (void)getrlimit(RLIMIT_NOFILE, &res); @@ -117,7 +117,7 @@ ATF_TC_BODY(revoke_err, tc) ATF_REQUIRE_ERRNO(ENAMETOOLONG, revoke(buf) == -1); #ifdef __FreeBSD__ - atf_tc_skip("revoke(2) is only implemented for devfs(5)."); + atf_tc_skip("revoke(2) is only implemented for devfs(4)."); #endif errno = 0; ATF_REQUIRE_ERRNO(EPERM, revoke("/etc/passwd") == -1); @@ -140,7 +140,7 @@ ATF_TC_BODY(revoke_perm, tc) pid_t pid; #ifdef __FreeBSD__ - atf_tc_skip("revoke(2) is only implemented for devfs(5)."); + atf_tc_skip("revoke(2) is only implemented for devfs(4)."); #endif pw = getpwnam("nobody"); fd = open(path, O_RDWR | O_CREAT, 0600); diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c index b782e5793334..18cbf64b9f4a 100644 --- a/lib/libc/gen/getvfsbyname.c +++ b/lib/libc/gen/getvfsbyname.c @@ -38,7 +38,7 @@ #include /* - * fusefs(5) file systems may have a "subtype" which gets appended to + * fusefs(4) file systems may have a "subtype" which gets appended to * statfs(2)'s f_fstypename field on a per-mount basis. Allow getvfsbyname to * match either the full "fusefs.foobar" or the more general "fusefs". */ diff --git a/libexec/rc/rc.initdiskless b/libexec/rc/rc.initdiskless index a6820a546e55..a4c6c613b85a 100644 --- a/libexec/rc/rc.initdiskless +++ b/libexec/rc/rc.initdiskless @@ -204,7 +204,7 @@ handle_remount() { # $1 = mount point } # Create a generic memory disk. -# The 'auto' parameter will attempt to use tmpfs(5), falls back to md(4). +# The 'auto' parameter will attempt to use tmpfs(4), falls back to md(4). # $1 is size in 512-byte sectors, $2 is the mount point. mount_md() { if [ ${o_verbose} -gt 0 ] ; then diff --git a/sbin/devd/autofs.conf b/sbin/devd/autofs.conf index a06ca7295d38..2671687ecd83 100644 --- a/sbin/devd/autofs.conf +++ b/sbin/devd/autofs.conf @@ -1,5 +1,5 @@ # -# autofs(5) specific devd events +# autofs(4) specific devd events # Discard autofs caches, useful for the -media special map. notify 100 { diff --git a/sbin/devfs/devfs.rules b/sbin/devfs/devfs.rules index f85940aaa7dd..c51672815e64 100644 --- a/sbin/devfs/devfs.rules +++ b/sbin/devfs/devfs.rules @@ -1,5 +1,5 @@ # -# The following are some default rules for devfs(5) mounts. +# The following are some default rules for devfs(4) mounts. # The format is very simple. Empty lines and lines beginning # with a hash '#' are ignored. If the hash mark occurs anywhere # other than the beginning of a line, it and any subsequent diff --git a/sys/README.md b/sys/README.md index 10c9f183f7e1..c36686e979f5 100644 --- a/sys/README.md +++ b/sys/README.md @@ -55,6 +55,6 @@ Source Roadmap: | security | security facilities - `audit(4)` and `mac(4)` | | sys | kernel headers | | tests | kernel unit tests | -| ufs | Unix File System - `ffs(7)` | +| ufs | Unix File System - `ffs(4)` | | vm | virtual memory system | | x86 | code shared by AMD64 and i386 architectures | diff --git a/sys/kern/imgact_binmisc.c b/sys/kern/imgact_binmisc.c index aa037bb6046a..ed7a314ec475 100644 --- a/sys/kern/imgact_binmisc.c +++ b/sys/kern/imgact_binmisc.c @@ -656,7 +656,7 @@ imgact_binmisc_exec(struct image_params *imgp) if (imgp->args->fname != NULL) { fname = imgp->args->fname; } else { - /* Use the fdescfs(5) path for fexecve(2). */ + /* Use the fdescfs(4) path for fexecve(2). */ sname = sbuf_new_auto(); sbuf_printf(sname, "/dev/fd/%d", imgp->args->fd); sbuf_finish(sname); diff --git a/tests/sys/fs/fusefs/mknod.cc b/tests/sys/fs/fusefs/mknod.cc index 1fb855f44f29..eb745f19acd5 100644 --- a/tests/sys/fs/fusefs/mknod.cc +++ b/tests/sys/fs/fusefs/mknod.cc @@ -283,7 +283,7 @@ TEST_F(Mknod, parent_inode) } /* - * fusefs(5) lacks VOP_WHITEOUT support. No bugzilla entry, because that's a + * fusefs(4) lacks VOP_WHITEOUT support. No bugzilla entry, because that's a * feature, not a bug */ TEST_F(Mknod, DISABLED_whiteout) diff --git a/tests/sys/fs/fusefs/open.cc b/tests/sys/fs/fusefs/open.cc index 7ab3aeb6ba2a..ff736e6c3a94 100644 --- a/tests/sys/fs/fusefs/open.cc +++ b/tests/sys/fs/fusefs/open.cc @@ -79,7 +79,7 @@ class OpenNoOpenSupport: public FuseTest { }; /* - * fusefs(5) does not support I/O on device nodes (neither does UFS). But it + * fusefs(4) does not support I/O on device nodes (neither does UFS). But it * shouldn't crash */ TEST_F(Open, chr) diff --git a/tests/sys/fs/fusefs/xattr.cc b/tests/sys/fs/fusefs/xattr.cc index 7fa2a741e074..b1cbb9ffa768 100644 --- a/tests/sys/fs/fusefs/xattr.cc +++ b/tests/sys/fs/fusefs/xattr.cc @@ -350,7 +350,7 @@ TEST_F(Listxattr, enotsup) * On Linux, however, the file system is supposed to return ERANGE if an * insufficiently large buffer is passed to listxattr(2). * - * fusefs(5) must guarantee the usual FreeBSD behavior. + * fusefs(4) must guarantee the usual FreeBSD behavior. */ TEST_F(Listxattr, erange) { diff --git a/tools/test/stress2/misc/devfs5.sh b/tools/test/stress2/misc/devfs5.sh index ab96b37bfa2b..5a72d7db9efb 100755 --- a/tools/test/stress2/misc/devfs5.sh +++ b/tools/test/stress2/misc/devfs5.sh @@ -30,7 +30,7 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 # Test scenario for https://reviews.freebsd.org/D20411 -# Add devfs(5) support for VOP_MKDIR(9) and VOP_RMDIR(9) +# Add devfs(4) support for VOP_MKDIR(9) and VOP_RMDIR(9) . ../default.cfg diff --git a/tools/test/stress2/misc/ext2fs3.sh b/tools/test/stress2/misc/ext2fs3.sh index f33b4cc73547..fd129a235102 100755 --- a/tools/test/stress2/misc/ext2fs3.sh +++ b/tools/test/stress2/misc/ext2fs3.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# ext2fs(5) test scenario with a 1k block size +# ext2fs(4) test scenario with a 1k block size # "panic: ext2_reallocblks: alloc mismatch" seen. # "Fatal trap 12: page fault while in kernel mode" seen. diff --git a/tools/test/stress2/misc/fifo4.sh b/tools/test/stress2/misc/fifo4.sh index 2a8a149e3105..1578b8786d43 100755 --- a/tools/test/stress2/misc/fifo4.sh +++ b/tools/test/stress2/misc/fifo4.sh @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# tmpfs(5) version of fifo2.sh +# tmpfs(4) version of fifo2.sh # No problems seen on HEAD. [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/tools/test/stress2/misc/mkfifo5.sh b/tools/test/stress2/misc/mkfifo5.sh index c0355cef2db0..96d30e5fe024 100755 --- a/tools/test/stress2/misc/mkfifo5.sh +++ b/tools/test/stress2/misc/mkfifo5.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# mkfifo(2), select(2) with tmpfs(5) scenario. +# mkfifo(2), select(2) with tmpfs(4) scenario. . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/tools/test/stress2/misc/mkfifo6.sh b/tools/test/stress2/misc/mkfifo6.sh index 5647bf9493d6..13a62b5e0286 100755 --- a/tools/test/stress2/misc/mkfifo6.sh +++ b/tools/test/stress2/misc/mkfifo6.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# mkfifo(2), select(2) with tmpfs(5) scenario. +# mkfifo(2), select(2) with tmpfs(4) scenario. . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/tools/test/stress2/misc/mkfifo7.sh b/tools/test/stress2/misc/mkfifo7.sh index b17e84536bed..c1af3374526e 100755 --- a/tools/test/stress2/misc/mkfifo7.sh +++ b/tools/test/stress2/misc/mkfifo7.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# mkfifo(2), poll(2) with tmpfs(5) scenario. +# mkfifo(2), poll(2) with tmpfs(4) scenario. . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/tools/test/stress2/misc/mlockall4.sh b/tools/test/stress2/misc/mlockall4.sh index 778256fa8976..66ae05fa4ae1 100755 --- a/tools/test/stress2/misc/mlockall4.sh +++ b/tools/test/stress2/misc/mlockall4.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# mlockall(2) / nullfs(5) scenario causes: +# mlockall(2) / nullfs(4) scenario causes: # http://people.freebsd.org/~pho/stress/log/kostik619.txt # kern/182661, fixed in r256211. diff --git a/tools/test/stress2/misc/msdos14.sh b/tools/test/stress2/misc/msdos14.sh index 9c7a636f5f59..aaa95144c14e 100755 --- a/tools/test/stress2/misc/msdos14.sh +++ b/tools/test/stress2/misc/msdos14.sh @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# Rename(2) test with msdosfs(5) +# Rename(2) test with msdosfs(4) # Test scenario by kib@ . ../default.cfg diff --git a/tools/test/stress2/misc/nullfs18.sh b/tools/test/stress2/misc/nullfs18.sh index 0ee0a1c2ef6b..b4414cbc3e3e 100755 --- a/tools/test/stress2/misc/nullfs18.sh +++ b/tools/test/stress2/misc/nullfs18.sh @@ -28,7 +28,7 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -# Demonstate nullfs(5) inode leak. +# Demonstate nullfs(4) inode leak. # Fixed by r295717. . ../default.cfg diff --git a/tools/test/stress2/misc/pread.sh b/tools/test/stress2/misc/pread.sh index 1bf3b874e6af..24ee2efb696a 100755 --- a/tools/test/stress2/misc/pread.sh +++ b/tools/test/stress2/misc/pread.sh @@ -46,13 +46,13 @@ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mount -t tmpfs tmpfs $mntpoint cp -a /usr/include $mntpoint -echo "Testing tmpfs(5)" +echo "Testing tmpfs(4)" /tmp/pread $mntpoint while mount | grep -q "on $mntpoint "; do umount $mntpoint || sleep 1 done -echo "Testing fdescfs(5)" +echo "Testing fdescfs(4)" mount -t fdescfs null /dev/fd for i in `jot 100`; do /tmp/pread /dev/fd @@ -62,7 +62,7 @@ while mount | grep -q "on /dev/fd "; do umount /dev/fd || sleep 1 done -echo "Testing procfs(5)" +echo "Testing procfs(4)" mount -t procfs procfs $mntpoint /tmp/pread $mntpoint while mount | grep -q "on $mntpoint "; do @@ -81,13 +81,13 @@ done mdconfig -d -u $mdstart mount -t nullfs /bin $mntpoint -echo "Testing nullfs(5)" +echo "Testing nullfs(4)" /tmp/pread $mntpoint while mount | grep -q "on $mntpoint "; do umount $mntpoint || sleep 1 done -echo "Testing procfs(5)" +echo "Testing procfs(4)" mount -t procfs procfs $mntpoint /tmp/pread $mntpoint while mount | grep -q "on $mntpoint "; do diff --git a/tools/test/stress2/misc/procfs3.sh b/tools/test/stress2/misc/procfs3.sh index c9c4820adbff..30bcc8b3cd62 100755 --- a/tools/test/stress2/misc/procfs3.sh +++ b/tools/test/stress2/misc/procfs3.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# procfs(5) test scenario. +# procfs(4) test scenario. # "panic: wchan 0xc10a4f68 has no wmesg" seen [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/tools/test/stress2/misc/readdir.sh b/tools/test/stress2/misc/readdir.sh index 8616a8a40206..425295631181 100755 --- a/tools/test/stress2/misc/readdir.sh +++ b/tools/test/stress2/misc/readdir.sh @@ -45,19 +45,19 @@ mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mount -t tmpfs tmpfs $mntpoint -echo "Testing tmpfs(5)" +echo "Testing tmpfs(4)" cp -a /usr/include $mntpoint /tmp/readdir $mntpoint umount $mntpoint -echo "Testing fdescfs(5)" +echo "Testing fdescfs(4)" kldstat -v | grep -q fdescfs || { kldload fdescfs.ko; loaded=1; } mount -t fdescfs null /dev/fd /tmp/readdir /dev/fd umount /dev/fd [ $unload ] && kldunload fdescfs.ko -echo "Testing procfs(5)" +echo "Testing procfs(4)" mount -t procfs procfs $mntpoint /tmp/readdir $mntpoint umount $mntpoint @@ -89,7 +89,7 @@ umount $mntpoint mdconfig -d -u $mdstart mount -t nullfs /bin $mntpoint -echo "Testing nullfs(5)" +echo "Testing nullfs(4)" /tmp/readdir $mntpoint umount $mntpoint diff --git a/tools/test/stress2/misc/sendfile5.sh b/tools/test/stress2/misc/sendfile5.sh index c81515003a13..933e4f94a73c 100755 --- a/tools/test/stress2/misc/sendfile5.sh +++ b/tools/test/stress2/misc/sendfile5.sh @@ -52,7 +52,7 @@ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart kldstat | grep -q tmpfs.ko || loaded=1 mount -t tmpfs tmpfs $mntpoint -echo "Testing tmpfs(5)" +echo "Testing tmpfs(4)" cp $diskimage $mntpoint /tmp/sendfile5 $mntpoint/$file umount $mntpoint @@ -68,7 +68,7 @@ umount $mntpoint mdconfig -d -u $mdstart mount -t nullfs $dir $mntpoint -echo "Testing nullfs(5)" +echo "Testing nullfs(4)" /tmp/sendfile5 $mntpoint/$file umount $mntpoint diff --git a/tools/test/stress2/misc/tmpfs10.sh b/tools/test/stress2/misc/tmpfs10.sh index 870530c57ea7..6388f59959a4 100755 --- a/tools/test/stress2/misc/tmpfs10.sh +++ b/tools/test/stress2/misc/tmpfs10.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# tmpfs(5) name lookup problem seen: +# tmpfs(4) name lookup problem seen: # $ ./tmpfs10.sh # tmpfs10: unlink(p01193.14729) at loop #2: No such file or directory diff --git a/tools/test/stress2/misc/tmpfs11.sh b/tools/test/stress2/misc/tmpfs11.sh index efb535b8ea94..629ca8ae3d31 100755 --- a/tools/test/stress2/misc/tmpfs11.sh +++ b/tools/test/stress2/misc/tmpfs11.sh @@ -28,7 +28,7 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -# Test with two tmpfs(5) file systems mounted. +# Test with two tmpfs(4) file systems mounted. . ../default.cfg diff --git a/tools/test/stress2/misc/tmpfs17.sh b/tools/test/stress2/misc/tmpfs17.sh index 878fcf6c95d1..d5f6c50d2e48 100755 --- a/tools/test/stress2/misc/tmpfs17.sh +++ b/tools/test/stress2/misc/tmpfs17.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# tmpfs(5) option nonc test scenario +# tmpfs(4) option nonc test scenario . ../default.cfg [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/tools/test/stress2/misc/tmpfs8.sh b/tools/test/stress2/misc/tmpfs8.sh index b17a329f69e7..b78f0e74562b 100755 --- a/tools/test/stress2/misc/tmpfs8.sh +++ b/tools/test/stress2/misc/tmpfs8.sh @@ -28,7 +28,7 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -# Demonstrate rename(2) cache problem for tmpfs(5). Fixed in r226987. +# Demonstrate rename(2) cache problem for tmpfs(4). Fixed in r226987. # Variation of rename6.sh . ../default.cfg diff --git a/tools/test/stress2/misc/unionfs17.sh b/tools/test/stress2/misc/unionfs17.sh index bcb6d242187b..9ddbd1cab8cb 100755 --- a/tools/test/stress2/misc/unionfs17.sh +++ b/tools/test/stress2/misc/unionfs17.sh @@ -6,7 +6,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -# unionfs(8) test +# unionfs(4) test # Variation of unionfs7.sh, but with tmpfs # "mkdir: rmdir(d17) Directory not empty" seen. diff --git a/tools/test/stress2/misc/unionfs18.sh b/tools/test/stress2/misc/unionfs18.sh index e772a67a07fb..a7840db263e1 100755 --- a/tools/test/stress2/misc/unionfs18.sh +++ b/tools/test/stress2/misc/unionfs18.sh @@ -6,7 +6,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -# Simple unionfs(8) + tmpfs test +# Simple unionfs(4) + tmpfs(4) test # "rmdir: d2: Directory not empty" seen. diff --git a/tools/test/stress2/misc/unionfs6.sh b/tools/test/stress2/misc/unionfs6.sh index 54e688b0a111..cae1995a2e0d 100755 --- a/tools/test/stress2/misc/unionfs6.sh +++ b/tools/test/stress2/misc/unionfs6.sh @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# unionfs(8) test +# unionfs(4) test # "panic: ufs dir vp 0xfffffe0157351068 ip 0xfffffe016a63d488 flags 0x3c06" seen [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/tools/test/stress2/misc/unionfs7.sh b/tools/test/stress2/misc/unionfs7.sh index 1684a960d142..6adcd01a5f83 100755 --- a/tools/test/stress2/misc/unionfs7.sh +++ b/tools/test/stress2/misc/unionfs7.sh @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# unionfs(8) test +# unionfs(4) test # "unionfs_get_node_status: 0xfffffe018f356770 is not exclusive locked but # should be" seen. diff --git a/tools/test/stress2/misc/unionfs8.sh b/tools/test/stress2/misc/unionfs8.sh index 9ddf5a990b82..fdc37b16ff03 100755 --- a/tools/test/stress2/misc/unionfs8.sh +++ b/tools/test/stress2/misc/unionfs8.sh @@ -27,7 +27,7 @@ # SUCH DAMAGE. # -# unionfs(8) test with a cd9660 file system +# unionfs(4) test with a cd9660(4) file system # "panic: unionfs_noderem: vnode 0xfffffe014f9259c8 locked recursively" seen # https://people.freebsd.org/~pho/stress/log/log0233.txt