diff options
| author | phk <phk@FreeBSD.org> | 2001-05-29 20:39:47 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2001-05-29 20:39:47 +0000 |
| commit | 9dfeaf738ee5fa7b38ea4495076dc6c073ca94cc (patch) | |
| tree | 1688295af4518ef7a2057488c51f169c2b30294f | |
| parent | 9649cf76ef3ba5272611a58929bbb31f7686c11d (diff) | |
| download | FreeBSD-src-9dfeaf738ee5fa7b38ea4495076dc6c073ca94cc.zip FreeBSD-src-9dfeaf738ee5fa7b38ea4495076dc6c073ca94cc.tar.gz | |
Remove MFS
| -rw-r--r-- | sbin/mountd/mountd.c | 5 | ||||
| -rw-r--r-- | sys/compat/linux/linux_stats.c | 2 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 3 | ||||
| -rw-r--r-- | usr.bin/fstat/fstat.c | 4 | ||||
| -rw-r--r-- | usr.sbin/mountd/mountd.c | 5 |
5 files changed, 3 insertions, 16 deletions
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index 35ea7da..8300964 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -937,13 +937,11 @@ get_exportlist() union { struct ufs_args ua; struct iso_args ia; - struct mfs_args ma; struct msdosfs_args da; struct ntfs_args na; } targs; - if (!strcmp(fsp->f_fstypename, "mfs") || - !strcmp(fsp->f_fstypename, "ufs") || + if (!strcmp(fsp->f_fstypename, "ufs") || !strcmp(fsp->f_fstypename, "msdos") || !strcmp(fsp->f_fstypename, "ntfs") || !strcmp(fsp->f_fstypename, "cd9660")) { @@ -1744,7 +1742,6 @@ do_mount(ep, grp, exflags, anoncrp, dirp, dirplen, fsb) union { struct ufs_args ua; struct iso_args ia; - struct mfs_args ma; struct msdosfs_args da; struct ntfs_args na; } args; diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 859bdb9..df112af 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -275,8 +275,6 @@ bsd_to_linux_ftype(int tag) return (LINUX_HPFS_SUPER_MAGIC); case VT_ISOFS: return (LINUX_ISOFS_SUPER_MAGIC); - case VT_MFS: - return (LINUX_UFS_SUPER_MAGIC); case VT_MSDOSFS: return (LINUX_MSDOS_SUPER_MAGIC); case VT_NFS: diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index f4650dc..f00bc03 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -67,7 +67,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, VT_SMBFS @@ -434,7 +434,6 @@ struct vop_generic_args { * [dfr] Kludge until I get around to fixing all the vfs locking. */ #define IS_LOCKING_VFS(vp) ((vp)->v_tag == VT_UFS \ - || (vp)->v_tag == VT_MFS \ || (vp)->v_tag == VT_NFS \ || (vp)->v_tag == VT_LFS \ || (vp)->v_tag == VT_ISOFS \ diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index b5e49f9..c9d0211 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -459,10 +459,6 @@ vtrans(vp, i, flag) if (!ufs_filestat(&vn, &fst)) badtype = "error"; break; - case VT_MFS: - if (!ufs_filestat(&vn, &fst)) - badtype = "error"; - break; case VT_NFS: if (!nfs_filestat(&vn, &fst)) badtype = "error"; diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 35ea7da..8300964 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -937,13 +937,11 @@ get_exportlist() union { struct ufs_args ua; struct iso_args ia; - struct mfs_args ma; struct msdosfs_args da; struct ntfs_args na; } targs; - if (!strcmp(fsp->f_fstypename, "mfs") || - !strcmp(fsp->f_fstypename, "ufs") || + if (!strcmp(fsp->f_fstypename, "ufs") || !strcmp(fsp->f_fstypename, "msdos") || !strcmp(fsp->f_fstypename, "ntfs") || !strcmp(fsp->f_fstypename, "cd9660")) { @@ -1744,7 +1742,6 @@ do_mount(ep, grp, exflags, anoncrp, dirp, dirplen, fsb) union { struct ufs_args ua; struct iso_args ia; - struct mfs_args ma; struct msdosfs_args da; struct ntfs_args na; } args; |
