Author: attilio
Date: Tue Oct 16 09:59:10 2012
New Revision: 241606
URL: http://svn.freebsd.org/changeset/base/241606
Log:
Disconnect non-MPSAFE PORTALFS from the build in preparation for dropping
GIANT from VFS.
This is not targeted for MFC.
Modified:
head/etc/defaults/rc.conf
head/etc/mtree/BSD.usr.dist
head/include/Makefile
head/sbin/mount/mount.8
head/sbin/mount/mount.c
head/share/doc/smm/01.setup/3.t
head/share/doc/smm/01.setup/4.t
head/share/examples/Makefile
head/share/man/man7/hier.7
head/sys/boot/forth/loader.conf
head/sys/conf/NOTES
head/sys/conf/files
head/sys/conf/options
head/sys/kern/Make.tags.inc
head/sys/modules/Makefile
head/usr.sbin/Makefile
head/usr.sbin/crunch/examples/really-big.conf
Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf Tue Oct 16 09:57:34 2012 (r241605)
+++ head/etc/defaults/rc.conf Tue Oct 16 09:59:10 2012 (r241606)
@@ -92,7 +92,7 @@ fsck_y_enable="NO" # Set to YES to do fs
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).
Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist Tue Oct 16 09:57:34 2012 (r241605)
+++ head/etc/mtree/BSD.usr.dist Tue Oct 16 09:59:10 2012 (r241606)
@@ -289,8 +289,6 @@
..
pf
..
- portal
- ..
ppi
..
ppp
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Tue Oct 16 09:57:34 2012 (r241605)
+++ head/include/Makefile Tue Oct 16 09:59:10 2012 (r241606)
@@ -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 \
Modified: head/sbin/mount/mount.8
==============================================================================
--- head/sbin/mount/mount.8 Tue Oct 16 09:57:34 2012 (r241605)
+++ head/sbin/mount/mount.8 Tue Oct 16 09:59:10 2012 (r241606)
@@ -450,7 +450,6 @@ However, for the following file system t
.Cm nwfs ,
.Cm nullfs ,
.Cm oldnfs ,
-.Cm portalfs ,
.Cm smbfs ,
.Cm udf ,
and
@@ -548,7 +547,6 @@ support for a particular file system mig
.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 ,
Modified: head/sbin/mount/mount.c
==============================================================================
--- head/sbin/mount/mount.c Tue Oct 16 09:57:34 2012 (r241605)
+++ head/sbin/mount/mount.c Tue Oct 16 09:59:10 2012 (r241606)
@@ -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
};
Modified: head/share/doc/smm/01.setup/3.t
==============================================================================
--- head/share/doc/smm/01.setup/3.t Tue Oct 16 09:57:34 2012
(r241605)
+++ head/share/doc/smm/01.setup/3.t Tue Oct 16 09:59:10 2012
(r241606)
@@ -1237,10 +1237,8 @@ location that uses a different password
.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.
Modified: head/share/doc/smm/01.setup/4.t
==============================================================================
--- head/share/doc/smm/01.setup/4.t Tue Oct 16 09:57:34 2012
(r241605)
+++ head/share/doc/smm/01.setup/4.t Tue Oct 16 09:59:10 2012
(r241606)
@@ -89,7 +89,6 @@ miscfs miscellaneous filesystems broken
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)
Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile Tue Oct 16 09:57:34 2012
(r241605)
+++ head/share/examples/Makefile Tue Oct 16 09:59:10 2012
(r241606)
@@ -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 \
Modified: head/share/man/man7/hier.7
==============================================================================
--- head/share/man/man7/hier.7 Tue Oct 16 09:57:34 2012 (r241605)
+++ head/share/man/man7/hier.7 Tue Oct 16 09:59:10 2012 (r241606)
@@ -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/
Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf Tue Oct 16 09:57:34 2012
(r241605)
+++ head/sys/boot/forth/loader.conf Tue Oct 16 09:59:10 2012
(r241606)
@@ -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
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Tue Oct 16 09:57:34 2012 (r241605)
+++ head/sys/conf/NOTES Tue Oct 16 09:59:10 2012 (r241606)
@@ -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
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Tue Oct 16 09:57:34 2012 (r241605)
+++ head/sys/conf/files Tue Oct 16 09:59:10 2012 (r241606)
@@ -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
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Tue Oct 16 09:57:34 2012 (r241605)
+++ head/sys/conf/options Tue Oct 16 09:59:10 2012 (r241606)
@@ -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
Modified: head/sys/kern/Make.tags.inc
==============================================================================
--- head/sys/kern/Make.tags.inc Tue Oct 16 09:57:34 2012 (r241605)
+++ head/sys/kern/Make.tags.inc Tue Oct 16 09:59:10 2012 (r241606)
@@ -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 \
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Tue Oct 16 09:57:34 2012 (r241605)
+++ head/sys/modules/Makefile Tue Oct 16 09:59:10 2012 (r241606)
@@ -263,7 +263,6 @@ SUBDIR= \
${_pfsync} \
plip \
${_pmc} \
- portalfs \
ppbus \
ppc \
ppi \
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Tue Oct 16 09:57:34 2012 (r241605)
+++ head/usr.sbin/Makefile Tue Oct 16 09:59:10 2012 (r241606)
@@ -46,7 +46,6 @@ SUBDIR= adduser \
mixer \
mlxcontrol \
mountd \
- mount_portalfs \
mptutil \
mtest \
mtree \
Modified: head/usr.sbin/crunch/examples/really-big.conf
==============================================================================
--- head/usr.sbin/crunch/examples/really-big.conf Tue Oct 16 09:57:34
2012 (r241605)
+++ head/usr.sbin/crunch/examples/really-big.conf Tue Oct 16 09:59:10
2012 (r241606)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
