summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2012-10-16 09:59:10 +0000
committerattilio <attilio@FreeBSD.org>2012-10-16 09:59:10 +0000
commitefcca33ac515c354e18135425794400ea32406a8 (patch)
treeade9f2ab0575d064e4d0632c53650470ddc16396
parent86c40ddfb934443151016d054ccb33321d4c11c5 (diff)
downloadFreeBSD-src-efcca33ac515c354e18135425794400ea32406a8.zip
FreeBSD-src-efcca33ac515c354e18135425794400ea32406a8.tar.gz
Disconnect non-MPSAFE PORTALFS from the build in preparation for dropping
GIANT from VFS. This is not targeted for MFC.
-rw-r--r--etc/defaults/rc.conf2
-rw-r--r--etc/mtree/BSD.usr.dist2
-rw-r--r--include/Makefile2
-rw-r--r--sbin/mount/mount.82
-rw-r--r--sbin/mount/mount.c2
-rw-r--r--share/doc/smm/01.setup/3.t6
-rw-r--r--share/doc/smm/01.setup/4.t1
-rw-r--r--share/examples/Makefile3
-rw-r--r--share/man/man7/hier.72
-rw-r--r--sys/boot/forth/loader.conf1
-rw-r--r--sys/conf/NOTES6
-rw-r--r--sys/conf/files2
-rw-r--r--sys/conf/options1
-rw-r--r--sys/kern/Make.tags.inc2
-rw-r--r--sys/modules/Makefile1
-rw-r--r--usr.sbin/Makefile1
-rw-r--r--usr.sbin/crunch/examples/really-big.conf2
17 files changed, 7 insertions, 31 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index b6bc27c..1dad35b 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -92,7 +92,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails.
fsck_y_flags="" # Additional flags for fsck -y
background_fsck="YES" # Attempt to run fsck in the background where possible.
background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
-netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.
+netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB nwfs:NWFS" # Net filesystems.
extra_netfs_types="NO" # List of network extra filesystem types for delayed
# mount at startup (or NO).
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 426e0f9..6c2ee065 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -289,8 +289,6 @@
..
pf
..
- portal
- ..
ppi
..
ppp
diff --git a/include/Makefile b/include/Makefile
index 573a661..89bcb91 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \
dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \
- ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
+ ${_fs_nwfs} fs/procfs fs/smbfs fs/udf fs/unionfs \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
geom/mirror geom/mountver geom/multipath geom/nop \
geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index c1ce669..fea0171 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -450,7 +450,6 @@ However, for the following file system types:
.Cm nwfs ,
.Cm nullfs ,
.Cm oldnfs ,
-.Cm portalfs ,
.Cm smbfs ,
.Cm udf ,
and
@@ -548,7 +547,6 @@ support for a particular file system might be provided either on a static
.Xr mount_ntfs 8 ,
.Xr mount_nullfs 8 ,
.Xr mount_nwfs 8 ,
-.Xr mount_portalfs 8 ,
.Xr mount_smbfs 8 ,
.Xr mount_udf 8 ,
.Xr mount_unionfs 8 ,
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index ca81795..63d53b0 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -143,7 +143,7 @@ use_mountprog(const char *vfstype)
unsigned int i;
const char *fs[] = {
"cd9660", "mfs", "msdosfs", "nfs", "ntfs",
- "nwfs", "nullfs", "oldnfs", "portalfs", "smbfs", "udf", "unionfs",
+ "nwfs", "nullfs", "oldnfs", "smbfs", "udf", "unionfs",
NULL
};
diff --git a/share/doc/smm/01.setup/3.t b/share/doc/smm/01.setup/3.t
index 5b0afd4..fb7be96 100644
--- a/share/doc/smm/01.setup/3.t
+++ b/share/doc/smm/01.setup/3.t
@@ -1237,10 +1237,8 @@ location that uses a different password file.
.PP
Other new filesystems that may be stacked include the loopback filesystem
.Xr mount_lofs (8),
-the kernel filesystem
-.Xr mount_kernfs (8),
-and the portal filesystem
-.Xr mount_portal (8).
+and the kernel filesystem
+.Xr mount_kernfs (8).
.PP
The buffer cache in the kernel is now organized as a file block cache
rather than a device block cache.
diff --git a/share/doc/smm/01.setup/4.t b/share/doc/smm/01.setup/4.t
index 25f9efa..149aab0 100644
--- a/share/doc/smm/01.setup/4.t
+++ b/share/doc/smm/01.setup/4.t
@@ -89,7 +89,6 @@ miscfs miscellaneous filesystems broken down as follows
kernfs filesystem access to kernel data structures
lofs loopback filesystem
nullfs another loopback filesystem
- portal associate processes with filesystem locations
specfs device special files
umapfs provide alternate uid/gid mappings
dev generic device drivers (SCSI, vnode, concatenated disk)
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 30f381a..36887eb 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -26,7 +26,6 @@ LDIRS= BSD_daemon \
netgraph \
nwclient \
perfmon \
- portal \
ppi \
ppp \
printing \
@@ -135,8 +134,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
perfmon/Makefile \
perfmon/README \
perfmon/perfmon.c \
- portal/README \
- portal/portal.conf \
ppi/Makefile \
ppi/ppilcd.c \
ppp/chap-auth \
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 2989eb4e..856d946 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -258,8 +258,6 @@ NTFS file system
loopback file system
.It Pa nwfs/
NetWare file system
-.It Pa portalfs/
-portal file system
.It Pa procfs/
process file system
.It Pa smbfs/
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index a5d044d..70df149 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -172,7 +172,6 @@ nfsserver_load="NO" # NFS server
ntfs_load="NO" # NTFS
ntfs_iconv_load="NO" # NTFS iconv character support
nullfs_load="NO" # Null filesystem
-portalfs_load="NO" # Portal filesystem
procfs_load="NO" # Process filesystem
reiserfs_load="NO" # ReiserFS
unionfs_load="NO" # Union filesystem
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index b323f23..14e5c05 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -988,10 +988,7 @@ options ZERO_COPY_SOCKETS
# time. Some people still prefer to statically compile other
# filesystems as well.
#
-# NB: The PORTAL filesystem is known to be buggy, and WILL panic your
-# system if you attempt to do anything with it. It is included here
-# as an incentive for some enterprising soul to sit down and fix it.
-# The UNION filesystem was known to be buggy in the past. It is now
+# NB: The UNION filesystem was known to be buggy in the past. It is now
# being actively maintained, although there are still some issues being
# resolved.
#
@@ -1019,7 +1016,6 @@ options NTFS
options NULLFS #NULL filesystem
# Broken (depends on NCP):
#options NWFS #NetWare filesystem
-options PORTALFS #Portal filesystem
options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
options PSEUDOFS_TRACE #Debugging support for PSEUDOFS
diff --git a/sys/conf/files b/sys/conf/files
index 3e1a9f0..2a745b9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2387,8 +2387,6 @@ fs/nwfs/nwfs_node.c optional nwfs
fs/nwfs/nwfs_subr.c optional nwfs
fs/nwfs/nwfs_vfsops.c optional nwfs
fs/nwfs/nwfs_vnops.c optional nwfs
-fs/portalfs/portal_vfsops.c optional portalfs
-fs/portalfs/portal_vnops.c optional portalfs
fs/procfs/procfs.c optional procfs
fs/procfs/procfs_ctl.c optional procfs
fs/procfs/procfs_dbregs.c optional procfs
diff --git a/sys/conf/options b/sys/conf/options
index a7ac311..4248b84 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -217,7 +217,6 @@ NANDFS opt_dontuse.h
NTFS opt_dontuse.h
NULLFS opt_dontuse.h
NWFS opt_dontuse.h
-PORTALFS opt_dontuse.h
PROCFS opt_dontuse.h
PSEUDOFS opt_dontuse.h
REISERFS opt_dontuse.h
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 9ef7250..28dc0f7 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -31,7 +31,6 @@ COMM= ${SYS}/dev/advansys/*.[ch] \
${SYS}/fs/ntfs/*.[ch] \
${SYS}/fs/nullfs/*.[ch] \
${SYS}/fs/nwfs/*.[ch] \
- ${SYS}/fs/portalfs/*.[ch] \
${SYS}/fs/procfs/*.[ch] \
${SYS}/fs/smbfs/*.[ch] \
${SYS}/fs/udf/*.[ch] \
@@ -92,7 +91,6 @@ COMMDIR2= ${SYS}/dev/advansys \
${SYS}/fs/fifofs \
${SYS}/fs/msdosfs \
${SYS}/fs/nullfs \
- ${SYS}/fs/portalfs \
${SYS}/fs/procfs \
${SYS}/fs/specfs \
${SYS}/fs/unionfs \
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index cc71d1a..e6d10db 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -263,7 +263,6 @@ SUBDIR= \
${_pfsync} \
plip \
${_pmc} \
- portalfs \
ppbus \
ppc \
ppi \
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index a915cab..296856b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -46,7 +46,6 @@ SUBDIR= adduser \
mixer \
mlxcontrol \
mountd \
- mount_portalfs \
mptutil \
mtest \
mtree \
diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf
index ab8a939..fbd7f03 100644
--- a/usr.sbin/crunch/examples/really-big.conf
+++ b/usr.sbin/crunch/examples/really-big.conf
@@ -25,7 +25,7 @@ srcdirs /usr/src/sbin
progs badsect bim clri disklabel dmesg dump dumpfs fdisk fsck halt
progs ifconfig init mknod modload modunload mount mount_isofs
-progs mount_lofs mount_msdosfs mount_portalfs mountd
+progs mount_lofs mount_msdosfs mountd
progs newfs nfsd nfsiod ping quotacheck reboot restore route routed savecore
progs shutdown swapon ttyflags tunefs umount
# shell scripts: fastboot
OpenPOWER on IntegriCloud