From 0b381bf1fd8fbb2df974c318d58643ecfeec44b0 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 1 Jun 2001 10:07:28 +0000 Subject: [PATCH] Remove vestiges of MFS. --- bin/df/df.1 | 4 ++-- etc/defaults/periodic.conf | 1 - etc/mtree/BSD.include.dist | 2 -- etc/periodic/daily/450.status-security | 5 ----- etc/rc.d/diskless | 2 +- etc/rc.d/resolv | 2 +- etc/rc.d/tmp | 2 +- etc/rc.d/var | 2 +- etc/rc.diskless2 | 2 +- etc/security | 3 +-- lib/libc/sys/chmod.2 | 5 +++-- lib/libc/sys/mount.2 | 23 ----------------------- sbin/mount/mount.8 | 9 ++++----- sbin/mountd/Makefile | 1 - sbin/umount/umount.8 | 4 ++-- share/doc/papers/contents/contents.ms | 14 -------------- share/doc/papers/memfs/Makefile | 22 ---------------------- share/man/man5/fstab.5 | 6 +----- share/man/man5/periodic.conf.5 | 8 -------- share/man/man7/hier.7 | 4 ---- share/man/man9/vnode.9 | 2 +- sys/boot/forth/loader.conf | 1 - sys/compat/linux/linux_stats.c | 2 +- sys/kern/Make.tags.inc | 2 -- sys/kern/Makefile | 2 +- sys/modules/md/Makefile | 2 +- usr.sbin/mountd/Makefile | 1 - usr.sbin/pstat/pstat.8 | 2 +- usr.sbin/pstat/pstat.c | 6 ++---- 29 files changed, 25 insertions(+), 116 deletions(-) delete mode 100644 share/doc/papers/memfs/Makefile diff --git a/bin/df/df.1 b/bin/df/df.1 index 4bbe1b3b6196..9a4b797cc41a 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -122,13 +122,13 @@ For example, the .Nm command: .Bd -literal -offset indent -df -t nonfs,mfs +df -t nonfs,nullfs .Ed .Pp lists all filesystems except those of type .Tn NFS and -.Tn MFS . +.Tn NULLFS . The .Xr lsvfs 1 command can be used to find out the types of filesystems diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf index 706a29c74700..8780ba55e84e 100644 --- a/etc/defaults/periodic.conf +++ b/etc/defaults/periodic.conf @@ -114,7 +114,6 @@ daily_status_security_enable="YES" # Security check daily_status_security_inline="NO" # Run inline ? daily_status_security_output="root" # user or /file daily_status_security_noamd="NO" # Don't check amd mounts -daily_status_security_nomfs="NO" # Don't check mfs mounts # 460.status-mail-rejects daily_status_mail_rejects_enable="YES" # Check mail rejects diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 69ead05ac925..175679605c8d 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -106,8 +106,6 @@ ufs ffs .. - mfs - .. ufs .. .. diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security index 4953fbb9c73d..d18723f01611 100755 --- a/etc/periodic/daily/450.status-security +++ b/etc/periodic/daily/450.status-security @@ -23,11 +23,6 @@ case "$daily_status_security_enable" in args=;; esac - case "$daily_status_security_nomfs" in - [Yy][Ee][Ss]) - args="$args -m";; - esac - case "$daily_status_security_inline" in [Yy][Ee][Ss]) sh /etc/security -s $args diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless index f297e243afcf..740c23c32a53 100644 --- a/etc/rc.d/diskless +++ b/etc/rc.d/diskless @@ -55,7 +55,7 @@ mount_md() /sbin/mount /dev/md$3c $2 } -echo "+++ mfs_mount of /var" +# If there is a global system configuration file, suck it in. mount_md ${varsize:=65536} /var 1 if [ -r /etc/rc.subr ]; then . /etc/rc.subr diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv index f297e243afcf..740c23c32a53 100644 --- a/etc/rc.d/resolv +++ b/etc/rc.d/resolv @@ -55,7 +55,7 @@ mount_md() /sbin/mount /dev/md$3c $2 } -echo "+++ mfs_mount of /var" +# If there is a global system configuration file, suck it in. mount_md ${varsize:=65536} /var 1 if [ -r /etc/rc.subr ]; then . /etc/rc.subr diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp index f297e243afcf..740c23c32a53 100644 --- a/etc/rc.d/tmp +++ b/etc/rc.d/tmp @@ -55,7 +55,7 @@ mount_md() /sbin/mount /dev/md$3c $2 } -echo "+++ mfs_mount of /var" +# If there is a global system configuration file, suck it in. mount_md ${varsize:=65536} /var 1 if [ -r /etc/rc.subr ]; then . /etc/rc.subr diff --git a/etc/rc.d/var b/etc/rc.d/var index f297e243afcf..740c23c32a53 100644 --- a/etc/rc.d/var +++ b/etc/rc.d/var @@ -55,7 +55,7 @@ mount_md() /sbin/mount /dev/md$3c $2 } -echo "+++ mfs_mount of /var" +# If there is a global system configuration file, suck it in. mount_md ${varsize:=65536} /var 1 if [ -r /etc/rc.subr ]; then . /etc/rc.subr diff --git a/etc/rc.diskless2 b/etc/rc.diskless2 index a3f58fe3ed92..fe329a6db0be 100644 --- a/etc/rc.diskless2 +++ b/etc/rc.diskless2 @@ -55,7 +55,7 @@ elif [ -r /etc/rc.conf ]; then . /etc/rc.conf fi -echo "+++ mfs_mount of /var" +echo "+++ mount_md of /var" mount_md ${varsize:=65536} /var 1 echo "+++ populate /var using /etc/mtree/BSD.var.dist" diff --git a/etc/security b/etc/security index f2b1d9479894..eaf2cb7c74c4 100644 --- a/etc/security +++ b/etc/security @@ -47,11 +47,10 @@ catmsgs() { } sflag=FALSE ignore= -while getopts ams c +while getopts as c do case "$c" in a) ignore="$ignore|^amd:";; - m) ignore="$ignore|^mfs:";; s) sflag=TRUE;; esac done diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2 index 1957859f954f..61f1b36a40fc 100644 --- a/lib/libc/sys/chmod.2 +++ b/lib/libc/sys/chmod.2 @@ -110,8 +110,9 @@ defined in The .Fx VM system totally ignores the sticky bit -.Pf ( Dv ISVTX -) for executables. On UFS-based filesystems (FFS, MFS, LFS) the sticky +.Pq Dv ISVTX +for executables. +On UFS-based filesystems (FFS, LFS) the sticky bit may only be set upon directories. .Pp If mode diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2 index b6682a9b101f..b2c14d0f6893 100644 --- a/lib/libc/sys/mount.2 +++ b/lib/libc/sys/mount.2 @@ -260,26 +260,6 @@ Some part of the information described by nfs_args points outside the process's allocated address space. .El .Pp -The following errors can occur for a -.Em mfs -filesystem mount: -.Bl -tag -width Er -.It Bq Er EMFILE -No space remains in the mount table. -.It Bq Er EINVAL -The super block for the filesystem had a bad magic -number or an out of range block size. -.It Bq Er ENOMEM -Not enough memory was available to read the cylinder -group information for the filesystem. -.It Bq Er EIO -A paging error occurred while reading the super block or -cylinder group information. -.It Bq Er EFAULT -.Em Name -points outside the process's allocated address space. -.El -.Pp The .Fn unmount function may fail with one of the following errors: @@ -307,13 +287,10 @@ points outside the process's allocated address space. .Pp A .Em ufs -or -.Em mfs mount can also fail if the maximum number of filesystems are currently mounted. .Sh SEE ALSO .Xr lsvfs 1 , -.Xr mfs 8 , .Xr mount 8 , .Xr umount 8 .Sh BUGS diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 05ae8b9a2cc6..d371c200e892 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -224,14 +224,14 @@ For example, the .Nm command: .Bd -literal -offset indent -mount -t mfs -o nosuid,-N,-s=4000 /dev/dk0b /tmp +mount -t unionfs -o -b /sys $HOME/sys .Ed .Pp causes .Nm to execute the equivalent of: .Bd -literal -offset indent -/sbin/mount_mfs -o nosuid -N -s 4000 /dev/dk0b /tmp +/sbin/mount_unionfs -b /sys $HOME/sys .Ed .Pp Additional options specific to filesystem types @@ -279,13 +279,13 @@ For example, the .Nm command: .Bd -literal -offset indent -mount -a -t nonfs,mfs +mount -a -t nonfs,nullfs .Ed .Pp mounts all filesystems except those of type .Tn NFS and -.Tn MFS . +.Tn NULLFS . .Pp If the type is not one of the internally known types, .Nm @@ -374,7 +374,6 @@ file system table .Xr mount_fdescfs 8 , .Xr mount_hpfs 8 , .Xr mount_linprocfs 8 , -.Xr mount_mfs 8 , .Xr mount_msdos 8 , .Xr mount_nfs 8 , .Xr mount_ntfs 8 , diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile index 5baf042258a4..96ec6b60e2ed 100644 --- a/sbin/mountd/Makefile +++ b/sbin/mountd/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= mountd -CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS MAN= exports.5 netgroup.5 mountd.8 .include diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8 index 2b11394c582e..3607368b6ef3 100644 --- a/sbin/umount/umount.8 +++ b/sbin/umount/umount.8 @@ -102,13 +102,13 @@ For example, the .Nm command: .Bd -literal -offset indent -umount -a -t nfs,mfs +umount -a -t nfs,nullfs .Ed .Pp unmounts all filesystems of the type .Tn NFS and -.Tn MFS +.Tn NULLFS that are listed in the .Xr fstab 5 file. diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms index f2e68f6ee86e..bc57cbbbb2a0 100644 --- a/share/doc/papers/contents/contents.ms +++ b/share/doc/papers/contents/contents.ms @@ -142,20 +142,6 @@ Marc Teitelbaum, Keith Bostic. .sp Revised February 2, 1989. -.sp -.IP -.tl '\fBMemory Based Filesystem''memfs\fP' -.if \n(.U \{\ -.br -.>> memfs.html -.\} -.QP -A Pageable Memory Based Filesystem. -.sp -Marshall Kirk McKusick, Michael J. Karels, Keith Bostic. -.sp -Revised 1990. - .sp .IP .tl '\fBFilesystem Interface''fsinterface\fP' diff --git a/share/doc/papers/memfs/Makefile b/share/doc/papers/memfs/Makefile deleted file mode 100644 index 358d543e6a8a..000000000000 --- a/share/doc/papers/memfs/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# From: @(#)Makefile 1.8 (Berkeley) 6/8/93 -# $FreeBSD$ - -VOLUME= papers -DOC= memfs -SRCS= tmac.srefs paper.t -MACROS= -ms -CLEANFILES=A.gt paper.t ref.bib.i -SRCDIR= ${.OBJDIR} # ack! - -A.gt: A.t - ${GRIND} < ${.ALLSRC} > ${.TARGET} - -paper.t: 0.t 1.t ref.bib.i A.gt - ${REFER} -n -e -l -s -p ${.CURDIR}/ref.bib ${.ALLSRC:Nref.bib.i} \ - > ${.TARGET} - -ref.bib.i: ref.bib - ${INDXBIB} -c ${.CURDIR}/../../../../contrib/groff/src/utils/indxbib/eign \ - -o ref.bib ${.ALLSRC} - -.include diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5 index 40bd50147553..dcf10e0be2ed 100644 --- a/share/man/man5/fstab.5 +++ b/share/man/man5/fstab.5 @@ -86,7 +86,7 @@ The system can support various filesystem types. Only the root, /usr, and /tmp filesystems need be statically compiled into the kernel; everything else will be automatically loaded at mount -time. (Exception: the UFS family - FFS, MFS, and LFS cannot +time. (Exception: the UFS family - FFS and LFS cannot currently be demand-loaded.) Some people still prefer to statically compile other filesystems as well. .Bl -tag -width indent -offset indent @@ -94,10 +94,6 @@ compile other filesystems as well. a local .Tn UNIX filesystem -.It Em mfs -a local memory-based -.Tn UNIX -filesystem .It Em nfs a Sun Microsystems compatible ``Network File System'' .It Em swap diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index f68c93dfd161..3a545f2719d2 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -445,13 +445,6 @@ Set to if you want to ignore .Xr amd 8 mounts when comparing against yesterdays filesystem mounts. -.It Va daily_status_security_nomfs -.Pq Vt bool -Set to -.Dq YES -if you want to ignore -.Xr mfs 8 -mounts when comparing against yesterdays filesystem mounts. .It Va daily_status_mail_rejects_enable .Pq Vt bool Set to @@ -616,7 +609,6 @@ is shared or distributed. .Xr ac 8 , .Xr chkgrp 8 , .Xr dump 8 , -.Xr mfs 8 , .Xr newsyslog 8 , .Xr periodic 8 .Sh HISTORY diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 2b91e28ae578..e401ccba5407 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -294,10 +294,6 @@ C include files for UFS (The U-word File System) .Bl -tag -width "kerberosIV/" -compact .It Pa ffs/ Fast filesystem -.It Pa mfs/ -memory file system; -see -.Xr mount_mfs 8 .It Pa ufs/ UFS filesystem .El diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9 index e91a5147e595..9aec55ac83f9 100644 --- a/share/man/man9/vnode.9 +++ b/share/man/man9/vnode.9 @@ -50,7 +50,7 @@ enum vtype { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD }; * and should NEVER be inspected by the kernel. */ enum vtagtype { - VT_NON, VT_UFS, VT_NFS, VT_MFS, VT_PC, VT_LFS, VT_LOFS, VT_FDESC, + VT_NON, VT_UFS, VT_NFS, VT_UNUSED, VT_PC, VT_LFS, VT_LOFS, VT_FDESC, VT_PORTAL, VT_NULL, VT_UMAP, VT_KERNFS, VT_PROCFS, VT_AFS, VT_ISOFS, VT_UNION, VT_MSDOSFS, VT_DEVFS, VT_TFS, VT_VFS, VT_CODA, VT_NTFS, VT_HPFS, VT_NWFS, VT_PSEUDOFS diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index bedc201617a2..abbfcc4e7a35 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -88,7 +88,6 @@ module_path="/boot/kernel;/boot/modules;/modules" # Set the module search path cd9660_load="NO" # ISO 9660 filesystem coda_load="NO" # CODA filesystem fdescfs_load="NO" # Filedescriptors filesystem -mfs_load="NO" # Memory filesystem msdosfs_load="NO" # FAT-12/16/32 nfs_load="NO" # NFS ntfs_load="NO" # NTFS diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index df112af724d1..53cbf3202cc3 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -262,7 +262,7 @@ struct linux_statfs_buf { /* * ext2fs uses the VT_UFS tag. A mounted ext2 filesystem will therefore - * be seen as an ufs/mfs filesystem. + * be seen as an ufs filesystem. */ static long bsd_to_linux_ftype(int tag) diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index 35ec2edb0ec8..45e857d829f8 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -52,7 +52,6 @@ COMM= ${SYS}/conf/*.[ch] \ ${SYS}/pci/*.[ch] \ ${SYS}/posix4/*.[ch] \ ${SYS}/ufs/ffs/*.[ch] \ - ${SYS}/ufs/mfs/*.[ch] \ ${SYS}/ufs/ufs/*.[ch] \ ${SYS}/vm/*.[ch] \ ${SYS}/sys/*.[ch] @@ -103,5 +102,4 @@ COMMDIR2= ${SYS}/dev/advansys \ ${SYS}/fs/unionfs \ ${SYS}/isofs/cd9660 \ ${SYS}/ufs/ffs \ - ${SYS}/ufs/mfs \ ${SYS}/ufs/ufs diff --git a/sys/kern/Makefile b/sys/kern/Makefile index 5cc169da498e..409c32d377ff 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -39,7 +39,7 @@ DGEN= conf \ hp hp/dev hp/hpux \ kern libkern \ net netccitt netinet netiso netns nfs scripts sys \ - ufs ufs/ffs ufs/lfs ufs/mfs ufs/ufs \ + ufs ufs/ffs ufs/lfs ufs/ufs \ vm tags:: diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile index 3f2130f28522..c28d0038d913 100644 --- a/sys/modules/md/Makefile +++ b/sys/modules/md/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../dev/md KMOD= md -SRCS= md.c opt_mfs.h opt_md.h vnode_if.h +SRCS= md.c opt_md.h vnode_if.h NOMAN= .include diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile index 5baf042258a4..96ec6b60e2ed 100644 --- a/usr.sbin/mountd/Makefile +++ b/usr.sbin/mountd/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= mountd -CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS MAN= exports.5 netgroup.5 mountd.8 .include diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8 index 5b82aca88333..7b8bed758c98 100644 --- a/usr.sbin/pstat/pstat.8 +++ b/usr.sbin/pstat/pstat.8 @@ -240,7 +240,7 @@ on where .Em fstype is one of -.Em ufs , nfs , mfs , or pc ; +.Em ufs , nfs , or pc ; .Em from is the filesystem is mounted from; .Em on diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index d8ddfbf34600..96f26b028e49 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -357,8 +357,7 @@ vnodemode() maddr = vp->v_mount; mount_print(mp); vnode_header(); - if (!strcmp(ST.f_fstypename, "ufs") || - !strcmp(ST.f_fstypename, "mfs")) + if (!strcmp(ST.f_fstypename, "ufs")) ufs_header(); else if (!strcmp(ST.f_fstypename, "nfs")) nfs_header(); @@ -367,8 +366,7 @@ vnodemode() (void)printf("\n"); } vnode_print(evp->avnode, vp); - if (!strcmp(ST.f_fstypename, "ufs") || - !strcmp(ST.f_fstypename, "mfs")) + if (!strcmp(ST.f_fstypename, "ufs")) ufs_print(vp); else if (!strcmp(ST.f_fstypename, "nfs")) nfs_print(vp);