From 167c1ad25731f1bcd014e75954e2eaa412f827a2 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 3 Dec 2008 05:53:20 +0100 Subject: [PATCH] Add a UFS(5) MLINK and reference it from various places. --- bin/cpdup/cpdup.1 | 3 ++- bin/rm/rm.1 | 3 ++- lib/libstand/libstand.3 | 2 +- sbin/disklabel/disklabel.8 | 2 +- sbin/disklabel64/disklabel64.8 | 2 +- sbin/mount/mount.8 | 4 +++- sbin/mount_null/mount_null.8 | 10 +++++++--- sbin/newfs/newfs.8 | 7 +++++-- sbin/vinum/vinum.8 | 22 +++++++++++++++------- share/man/man4/vinum.4 | 4 +++- share/man/man5/Makefile | 1 + share/man/man5/ffs.5 | 3 ++- usr.bin/quota/quota.1 | 2 +- 13 files changed, 44 insertions(+), 21 deletions(-) diff --git a/bin/cpdup/cpdup.1 b/bin/cpdup/cpdup.1 index bf2ad214fc..9909ff62ab 100644 --- a/bin/cpdup/cpdup.1 +++ b/bin/cpdup/cpdup.1 @@ -251,7 +251,8 @@ and was placed under the copyright for inclusion in the ports area in 1999. The program was written by Matthew Dillon and Dima Ruban. .Sh BUGS -UFS has a hardlink limit of 32767. Many programs, in particular CVS +.Xr UFS 5 +has a hardlink limit of 32767. Many programs, in particular CVS with regards to its CVS/Root file, will generate a lot of hard links. When using the .Fl H diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index c3be598371..8b37db2fe1 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -223,7 +223,8 @@ The .Fl P option assumes that the underlying file system is a fixed-block file system. -UFS is a fixed-block file system, LFS is not. +.Xr UFS 5 +is a fixed-block file system, LFS is not. In addition, only regular files are overwritten, other types of files are not. Hardlinked regular files will not be overwritten or removed, possibly leading to unintended behavior. It is arguable which is the MORE diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3 index d9031634a8..2f92059ee4 100644 --- a/lib/libstand/libstand.3 +++ b/lib/libstand/libstand.3 @@ -578,7 +578,7 @@ the consumer may supply other filesystems of their own: .It Va ufs_fsops The .Bx -UFS. +.Xr UFS 5 . .It Va ext2fs_fsops Linux ext2fs filesystem. .It Va tftp_fsops diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8 index f2a737d2d1..5eea317144 100644 --- a/sbin/disklabel/disklabel.8 +++ b/sbin/disklabel/disklabel.8 @@ -728,7 +728,7 @@ will be interpreted as an offset of 0. Describes the purpose of the partition. The example shows all currently used partition types. For -.Tn UFS +.Xr UFS 5 file systems, use type .Cm 4.2BSD . For diff --git a/sbin/disklabel64/disklabel64.8 b/sbin/disklabel64/disklabel64.8 index 45b5a839ab..0c5fbec5a3 100644 --- a/sbin/disklabel64/disklabel64.8 +++ b/sbin/disklabel64/disklabel64.8 @@ -691,7 +691,7 @@ one. Describes the purpose of the partition. The example shows all currently used partition types. For -.Tn UFS +.Xr UFS 5 file systems, use type .Cm 4.2BSD . For diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index df55101b6a..07b350df7e 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -199,7 +199,9 @@ It provides security holes for shell users and as such should not be used on shell machines, especially on home directories. This option requires the SUIDDIR option in the kernel to work. -Only UFS filesystems support this option. +Only +.Xr UFS 5 +filesystems support this option. See .Xr chmod 2 for more information. diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8 index e1e69afc03..d7b613c65b 100644 --- a/sbin/mount_null/mount_null.8 +++ b/sbin/mount_null/mount_null.8 @@ -180,11 +180,15 @@ A would be done on the root null-node. This operation would bypass through to the lower layer which would return a vnode representing -the UFS +the +.Xr UFS 5 .Pa sys -(assuming that the lower layer is an UFS file system). +(assuming that the lower layer is an +.Xr UFS 5 +file system). Null_bypass then builds a null-node -aliasing the UFS +aliasing the +.Xr UFS 5 .Pa sys and returns this to the caller. Later operations on the null-node diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index 7f16caab6b..d149d3753a 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -238,7 +238,8 @@ See .Xr tunefs 8 for more details on how to set this option. .It Fl n Ar number of distinguished rotational positions -UFS has the ability to keep track of the availability of blocks at different +.Xr UFS 5 +has the ability to keep track of the availability of blocks at different rotational positions, so that it could lay out the data to be picked up with minimum rotational latency. This parameter specifies the default number of rotational positions to distinguish. @@ -368,7 +369,9 @@ man page for possible options and their meanings. .Sh EXAMPLES .Dl newfs /dev/ad3s1a .Pp -Creates a new ufs file system on +Creates a new +.Xr UFS +file system on .Pa ad3s1a . .Nm will use a block size of 16384 bytes, a fragment size of 2048 bytes diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8 index 125286ef1d..e199e3660c 100644 --- a/sbin/vinum/vinum.8 +++ b/sbin/vinum/vinum.8 @@ -787,12 +787,12 @@ prints a console message when the initialization is complete. The .Ic label command writes a -.Em ufs +.Xr UFS 5 style volume label on a volume. It is a simple alternative to an appropriate call to .Ic disklabel . This is needed because some -.Em ufs +.Xr UFS 5 commands still read the disk to find the label instead of using the correct .Xr ioctl 2 call to access it. @@ -1843,7 +1843,7 @@ partition. Partitions and .Dq Li f may be used as -.Em UFS +.Xr UFS 5 file systems. Partition .Dq Li b @@ -2270,7 +2270,9 @@ reasonably small number of fragmented requests with a stripe size between 256 kB and 512 kB; with correct RAID implementations there is no obvious reason not to increase the size to 2 or 4 MB on a large disk. .Pp -When choosing a stripe size, consider that most current UFS file systems have +When choosing a stripe size, consider that most current +.Xr UFS 5 +file systems have cylinder groups 32 MB in size. If you have a stripe size and number of disks both of which are a power of two, it is probable that all superblocks and inodes will be placed on the same subdisk, which will impact performance significantly. @@ -2334,8 +2336,12 @@ volume: Striping improves performance for multiple access only, since it increases the chance of individual requests being on different drives. .It -Concatenating UFS file systems across multiple drives can also improve -performance for multiple file access, since UFS divides a file system into +Concatenating +.Xr UFS 5 +file systems across multiple drives can also improve +performance for multiple file access, since +.Xr UFS 5 +divides a file system into cylinder groups and attempts to keep files in a single cylinder group. In general, it is not as effective as striping. .It @@ -2400,7 +2406,9 @@ will suffer when the configuration changes. Use appropriately sized subdisks in It is possible to increase the size of a concatenated .Nm plex, but currently the size of striped and RAID-5 plexes cannot be increased. -Currently the size of an existing UFS file system also cannot be increased, but +Currently the size of an existing +.Xr UFS 5 +file system also cannot be increased, but it is planned to make both plexes and file systems extensible. .El .Sh STATE MANAGEMENT diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4 index 17d1f7150b..16a7edeb9f 100644 --- a/share/man/man4/vinum.4 +++ b/share/man/man4/vinum.4 @@ -369,7 +369,9 @@ flag to .Xr newfs 8 . For example, if you have a volume .Pa concat , -use the following command to create a UFS file system on it: +use the following command to create a +.Xr UFS 5 +file system on it: .Pp .Dl "newfs -v /dev/vinum/concat" .Sh OBJECT NAMING diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index af6116a295..5c7ddf1f86 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -59,6 +59,7 @@ MAN= acct.5 \ varsym.conf.5 MLINKS= dir.5 dirent.5 +MLINKS+=ffs.5 UFS.5 MLINKS+=fs.5 inode.5 MLINKS+=hammer.5 HAMMER.5 MLINKS+=hosts.equiv.5 rhosts.5 diff --git a/share/man/man5/ffs.5 b/share/man/man5/ffs.5 index 96b8026b8d..129edcde0c 100644 --- a/share/man/man5/ffs.5 +++ b/share/man/man5/ffs.5 @@ -35,7 +35,8 @@ .Dt FFS 5 .Os .Sh NAME -.Nm ffs +.Nm ffs , +.Nm ufs .Nd Berkeley fast file system .Sh SYNOPSIS In the kernel configuration file: diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1 index ade56b65df..d2f3e2d761 100644 --- a/usr.bin/quota/quota.1 +++ b/usr.bin/quota/quota.1 @@ -119,7 +119,7 @@ daemon on the .Tn NFS server. For -.Tn UFS +.Xr UFS 5 file systems, quotas must be turned on in .Pa /etc/fstab . If -- 2.41.0