Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

man filesystems: fix more xrefs after move to s4 #1282

Merged
merged 1 commit into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions contrib/netbsd-tests/lib/libc/sys/t_revoke.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/gen/getvfsbyname.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <string.h>

/*
* 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".
*/
Expand Down
2 changes: 1 addition & 1 deletion libexec/rc/rc.initdiskless
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sbin/devd/autofs.conf
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion sbin/devfs/devfs.rules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sys/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
2 changes: 1 addition & 1 deletion sys/kern/imgact_binmisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion tests/sys/fs/fusefs/mknod.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/sys/fs/fusefs/open.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/sys/fs/fusefs/xattr.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/devfs5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/ext2fs3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/fifo4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/mkfifo5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/mkfifo6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/mkfifo7.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/mlockall4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/msdos14.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# SUCH DAMAGE.
#

# Rename(2) test with msdosfs(5)
# Rename(2) test with msdosfs(4)
# Test scenario by kib@

. ../default.cfg
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/nullfs18.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tools/test/stress2/misc/pread.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/procfs3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tools/test/stress2/misc/readdir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tools/test/stress2/misc/sendfile5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/tmpfs10.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/tmpfs11.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/tmpfs17.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/tmpfs8.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/unionfs17.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/unionfs18.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/unionfs6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/unionfs7.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/test/stress2/misc/unionfs8.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
# 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

Check warning on line 33 in tools/test/stress2/misc/unionfs8.sh

View workflow job for this annotation

GitHub Actions / Style Checker

Missing Signed-off-by: line

[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
[ -z "`type mkisofs 2>/dev/null`" ] &&
Expand Down
Loading