Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Oct 2012 11:16:17 +0000 (UTC)
From:      Attilio Rao <attilio@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r241629 - in head: . etc/defaults etc/mtree include lib lib/libprocstat rescue/rescue sbin/mount share/examples share/man/man5 share/man/man7 share/mk sys/conf sys/kern sys/modules usr....
Message-ID:  <201210171116.q9HBGHHb057721@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: attilio
Date: Wed Oct 17 11:16:17 2012
New Revision: 241629
URL: http://svn.freebsd.org/changeset/base/241629

Log:
  Disconnect non-MPSAFE NWFS from the build in preparation for dropping
  GIANT from VFS. In addition, disconnect also netncp, which is a base
  requirement for NWFS.
  
  In the possibility of a future maintenance of the code and later
  readd to the FreeBSD base, maybe we should think about a better location
  for netncp. I'm not entirely sure the / top location is actually right,
  however I will let network people to comment on that more specifically.
  
  This is not targeted for MFC.

Modified:
  head/MAINTAINERS
  head/etc/defaults/rc.conf
  head/etc/mtree/BSD.include.dist
  head/etc/mtree/BSD.usr.dist
  head/include/Makefile
  head/lib/Makefile
  head/lib/libprocstat/Makefile
  head/lib/libprocstat/common_kvm.h
  head/lib/libprocstat/libprocstat.c
  head/rescue/rescue/Makefile
  head/sbin/mount/mount.8
  head/sbin/mount/mount.c
  head/share/examples/Makefile
  head/share/man/man5/src.conf.5
  head/share/man/man7/hier.7
  head/share/mk/bsd.libnames.mk
  head/share/mk/bsd.own.mk
  head/sys/conf/NOTES
  head/sys/conf/files
  head/sys/conf/options
  head/sys/kern/Make.tags.inc
  head/sys/modules/Makefile
  head/usr.bin/Makefile.amd64
  head/usr.bin/Makefile.i386
  head/usr.sbin/Makefile.amd64
  head/usr.sbin/Makefile.i386

Modified: head/MAINTAINERS
==============================================================================
--- head/MAINTAINERS	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/MAINTAINERS	Wed Oct 17 11:16:17 2012	(r241629)
@@ -74,8 +74,6 @@ drm		rnoland	Just keep me informed of ch
 unifdef(1)	fanf	Pre-commit review requested.
 ntp         	roberto	Pre-commit review requested.
 inetd		dwmalone	Recommends pre-commit review.
-nwfs		bp	In case of functional changes pre-commit review
-			requested.
 contrib/smbfs	bp	Open for in-tree committs. In case of functional
 			changes pre-commit review requested.
 contrib/pf	mlaier	Pre-commit review requested.

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/etc/defaults/rc.conf	Wed Oct 17 11:16:17 2012	(r241629)
@@ -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 nwfs:NWFS" # Net filesystems.
+netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems.
 extra_netfs_types="NO"	# List of network extra filesystem types for delayed
 			# mount at startup (or NO).
 

Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/etc/mtree/BSD.include.dist	Wed Oct 17 11:16:17 2012	(r241629)
@@ -168,8 +168,6 @@
         ..
         nullfs
         ..
-        nwfs
-        ..
         portalfs
         ..
         procfs
@@ -287,8 +285,6 @@
         sig
         ..
     ..
-    netncp
-    ..
     netsmb
     ..
     nfs

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/etc/mtree/BSD.usr.dist	Wed Oct 17 11:16:17 2012	(r241629)
@@ -281,8 +281,6 @@
                 bluetooth
                 ..
             ..
-            nwclient
-            ..
             pc-sysinstall
             ..
             perfmon

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/include/Makefile	Wed Oct 17 11:16:17 2012	(r241629)
@@ -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/procfs fs/smbfs fs/udf fs/unionfs \
+	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 \
@@ -81,11 +81,6 @@ LSUBSUBDIRS+=	netgraph/bluetooth/include
 _netipx=	netipx
 #.endif
 
-.if ${MK_NCP} != "no"
-_netncp=	netncp
-_fs_nwfs=	fs/nwfs
-.endif
-
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies'').  ``symlinks'' is
 # probably only useful for developers and should be avoided if you do not

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/lib/Makefile	Wed Oct 17 11:16:17 2012	(r241629)
@@ -89,7 +89,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libmilter} \
 	${_libmp} \
 	${_libnandfs} \
-	${_libncp} \
 	${_libngatm} \
 	libopie \
 	libpam \
@@ -189,9 +188,6 @@ _libypclnt=	libypclnt
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-.if ${MK_NCP} != "no"
-_libncp=	libncp
-.endif
 _libsmb=	libsmb
 _libvgl=	libvgl
 _libproc=	libproc

Modified: head/lib/libprocstat/Makefile
==============================================================================
--- head/lib/libprocstat/Makefile	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/lib/libprocstat/Makefile	Wed Oct 17 11:16:17 2012	(r241629)
@@ -24,11 +24,6 @@ LDADD=		-lkvm -lutil
 
 MAN=		libprocstat.3
 
-.if ${MK_NCP} != "no"
-CFLAGS+=	-DLIBPROCSTAT_NWFS
-SRCS+=	nwfs.c
-.endif
-
 # XXX This is a hack.
 .if ${MK_CDDL} != "no"
 CFLAGS+=	-DLIBPROCSTAT_ZFS

Modified: head/lib/libprocstat/common_kvm.h
==============================================================================
--- head/lib/libprocstat/common_kvm.h	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/lib/libprocstat/common_kvm.h	Wed Oct 17 11:16:17 2012	(r241629)
@@ -42,7 +42,6 @@ int	isofs_filestat(kvm_t *kd, struct vno
 int	msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	ntfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
-int	nwfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	smbfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	udf_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
 int	ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);

Modified: head/lib/libprocstat/libprocstat.c
==============================================================================
--- head/lib/libprocstat/libprocstat.c	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/lib/libprocstat/libprocstat.c	Wed Oct 17 11:16:17 2012	(r241629)
@@ -974,9 +974,6 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s
 		FSTYPE(msdosfs),
 		FSTYPE(nfs),
 		FSTYPE(ntfs),
-#ifdef LIBPROCSTAT_NWFS
-		FSTYPE(nwfs), 
-#endif
 		FSTYPE(smbfs),
 		FSTYPE(udf), 
 		FSTYPE(ufs),

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/rescue/rescue/Makefile	Wed Oct 17 11:16:17 2012	(r241629)
@@ -130,10 +130,6 @@ CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -
 .if ${MACHINE_CPUARCH} == "i386"
 CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
 CRUNCH_ALIAS_bsdlabel= disklabel
-#.if ${MK_NCP} != "no"
-#CRUNCH_PROGS+= mount_nwfs
-#CRUNCH_LIBS+= -lncp
-#.endif
 #CRUNCH_PROGS+= mount_smbfs
 #CRUNCH_LIBS+= -lsmb
 .endif

Modified: head/sbin/mount/mount.8
==============================================================================
--- head/sbin/mount/mount.8	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/sbin/mount/mount.8	Wed Oct 17 11:16:17 2012	(r241629)
@@ -447,7 +447,6 @@ However, for the following file system t
 .Cm msdosfs ,
 .Cm nfs ,
 .Cm ntfs ,
-.Cm nwfs ,
 .Cm nullfs ,
 .Cm oldnfs ,
 .Cm smbfs ,
@@ -546,7 +545,6 @@ support for a particular file system mig
 .Xr mount_nfs 8 ,
 .Xr mount_ntfs 8 ,
 .Xr mount_nullfs 8 ,
-.Xr mount_nwfs 8 ,
 .Xr mount_smbfs 8 ,
 .Xr mount_udf 8 ,
 .Xr mount_unionfs 8 ,

Modified: head/sbin/mount/mount.c
==============================================================================
--- head/sbin/mount/mount.c	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/sbin/mount/mount.c	Wed Oct 17 11:16:17 2012	(r241629)
@@ -143,7 +143,7 @@ use_mountprog(const char *vfstype)
 	unsigned int i;
 	const char *fs[] = {
 	"cd9660", "mfs", "msdosfs", "nfs", "ntfs",
-	"nwfs", "nullfs", "oldnfs", "smbfs", "udf", "unionfs",
+	"nullfs", "oldnfs", "smbfs", "udf", "unionfs",
 	NULL
 	};
 

Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/share/examples/Makefile	Wed Oct 17 11:16:17 2012	(r241629)
@@ -24,7 +24,6 @@ LDIRS=	BSD_daemon \
 	libvgl \
 	mdoc \
 	netgraph \
-	nwclient \
 	perfmon \
 	ppi \
 	ppp \
@@ -129,8 +128,6 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	netgraph/udp.tunnel \
 	netgraph/virtual.chain \
 	netgraph/virtual.lan \
-	nwclient/dot.nwfsrc \
-	nwclient/nwfs.sh.sample \
 	perfmon/Makefile \
 	perfmon/README \
 	perfmon/perfmon.c \

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/share/man/man5/src.conf.5	Wed Oct 17 11:16:17 2012	(r241629)
@@ -547,8 +547,6 @@ When set, it also enforces the following
 .Bl -item -compact
 .It
 .Va WITHOUT_IPX_SUPPORT
-.It
-.Va WITHOUT_NCP
 .El
 .It Va WITHOUT_IPX_SUPPORT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_IPX_SUPPORT 156932 2006-03-21 07:50:50Z ru

Modified: head/share/man/man7/hier.7
==============================================================================
--- head/share/man/man7/hier.7	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/share/man/man7/hier.7	Wed Oct 17 11:16:17 2012	(r241629)
@@ -256,8 +256,6 @@ C include files for NFS (Network File Sy
 NTFS file system
 .It Pa nullfs/
 loopback file system
-.It Pa nwfs/
-NetWare file system
 .It Pa procfs/
 process file system
 .It Pa smbfs/

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/share/mk/bsd.libnames.mk	Wed Oct 17 11:16:17 2012	(r241629)
@@ -97,9 +97,6 @@ LIBMENU?=	${DESTDIR}${LIBDIR}/libmenu.a
 LIBMILTER?=	${DESTDIR}${LIBDIR}/libmilter.a
 .endif
 LIBMP?=		${DESTDIR}${LIBDIR}/libmp.a
-.if ${MK_NCP} != "no"
-LIBNCP?=	${DESTDIR}${LIBDIR}/libncp.a
-.endif
 LIBNCURSES?=	${DESTDIR}${LIBDIR}/libncurses.a
 LIBNCURSESW?=	${DESTDIR}${LIBDIR}/libncursesw.a
 LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnetgraph.a

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/share/mk/bsd.own.mk	Wed Oct 17 11:16:17 2012	(r241629)
@@ -374,7 +374,6 @@ __DEFAULT_YES_OPTIONS = \
     MAILWRAPPER \
     MAKE \
     MAN \
-    NCP \
     NDIS \
     NETCAT \
     NETGRAPH \
@@ -550,10 +549,6 @@ MK_CLANG:=	no
 MK_GROFF:=	no
 .endif
 
-.if ${MK_IPX} == "no"
-MK_NCP:=	no
-.endif
-
 .if ${MK_MAIL} == "no"
 MK_MAILWRAPPER:= no
 MK_SENDMAIL:=	no

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/sys/conf/NOTES	Wed Oct 17 11:16:17 2012	(r241629)
@@ -570,8 +570,6 @@ options		IPSEC_NAT_T		#NAT-T support, UD
 
 options 	IPX			#IPX/SPX communications protocols
 
-options 	NCP			#NetWare Core protocol
-
 options 	NETATALK		#Appletalk communications protocols
 options 	NETATALKDEBUG		#Appletalk debugging
 
@@ -1014,8 +1012,6 @@ options 	KGSSAPI			#Kernel GSSAPI implem
 options 	NTFS
 
 options 	NULLFS			#NULL filesystem
-# Broken (depends on NCP):
-#options 	NWFS			#NetWare 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	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/sys/conf/files	Wed Oct 17 11:16:17 2012	(r241629)
@@ -2375,12 +2375,6 @@ fs/ntfs/ntfs_vnops.c		optional ntfs
 fs/nullfs/null_subr.c		optional nullfs
 fs/nullfs/null_vfsops.c		optional nullfs
 fs/nullfs/null_vnops.c		optional nullfs
-fs/nwfs/nwfs_io.c		optional nwfs
-fs/nwfs/nwfs_ioctl.c		optional nwfs
-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/procfs/procfs.c		optional procfs
 fs/procfs/procfs_ctl.c		optional procfs
 fs/procfs/procfs_dbregs.c	optional procfs
@@ -3141,15 +3135,6 @@ netipx/spx_usrreq.c		optional ipx
 netnatm/natm.c			optional natm
 netnatm/natm_pcb.c		optional natm
 netnatm/natm_proto.c		optional natm
-netncp/ncp_conn.c		optional ncp
-netncp/ncp_crypt.c		optional ncp
-netncp/ncp_login.c		optional ncp
-netncp/ncp_mod.c		optional ncp
-netncp/ncp_ncp.c		optional ncp
-netncp/ncp_nls.c		optional ncp
-netncp/ncp_rq.c			optional ncp
-netncp/ncp_sock.c		optional ncp
-netncp/ncp_subr.c		optional ncp
 netpfil/ipfw/dn_heap.c		optional inet dummynet
 netpfil/ipfw/dn_sched_fifo.c	optional inet dummynet
 netpfil/ipfw/dn_sched_prio.c	optional inet dummynet

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/sys/conf/options	Wed Oct 17 11:16:17 2012	(r241629)
@@ -214,7 +214,6 @@ MSDOSFS		opt_dontuse.h
 NANDFS		opt_dontuse.h
 NTFS		opt_dontuse.h
 NULLFS		opt_dontuse.h
-NWFS		opt_dontuse.h
 PROCFS		opt_dontuse.h
 PSEUDOFS	opt_dontuse.h
 REISERFS	opt_dontuse.h
@@ -423,7 +422,6 @@ LIBMCHAIN
 MBUF_PROFILING
 MBUF_STRESS_TEST
 MROUTING		opt_mrouting.h
-NCP
 NETATALK		opt_atalk.h
 NFSLOCKD
 PCBGROUP		opt_pcbgroup.h

Modified: head/sys/kern/Make.tags.inc
==============================================================================
--- head/sys/kern/Make.tags.inc	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/sys/kern/Make.tags.inc	Wed Oct 17 11:16:17 2012	(r241629)
@@ -30,7 +30,6 @@ COMM=	${SYS}/dev/advansys/*.[ch] \
 	${SYS}/fs/msdosfs/*.[ch] \
 	${SYS}/fs/ntfs/*.[ch] \
 	${SYS}/fs/nullfs/*.[ch] \
-	${SYS}/fs/nwfs/*.[ch] \
 	${SYS}/fs/procfs/*.[ch] \
 	${SYS}/fs/smbfs/*.[ch] \
 	${SYS}/fs/udf/*.[ch] \

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/sys/modules/Makefile	Wed Oct 17 11:16:17 2012	(r241629)
@@ -247,7 +247,6 @@ SUBDIR=	\
 	${_nve} \
 	${_nvme} \
 	${_nvram} \
-	${_nwfs} \
 	${_nxge} \
 	${_opensolaris} \
 	oce \
@@ -504,15 +503,9 @@ _mlx4ib=	mlx4ib
 _mlxen=		mlxen
 _mthca=		mthca
 .endif
-.if ${MK_NCP} != "no"
-_ncp=		ncp
-.endif
 _ncv=		ncv
 _ndis=		ndis
 _nsp=		nsp
-.if ${MK_NCP} != "no"
-_nwfs=		nwfs
-.endif
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
 .endif

Modified: head/usr.bin/Makefile.amd64
==============================================================================
--- head/usr.bin/Makefile.amd64	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/usr.bin/Makefile.amd64	Wed Oct 17 11:16:17 2012	(r241629)
@@ -1,7 +1,3 @@
 # $FreeBSD$
 
-.if ${MK_NCP} != "no"
-SUBDIR+=	ncplist
-SUBDIR+=	ncplogin
-.endif
 SUBDIR+=	smbutil

Modified: head/usr.bin/Makefile.i386
==============================================================================
--- head/usr.bin/Makefile.i386	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/usr.bin/Makefile.i386	Wed Oct 17 11:16:17 2012	(r241629)
@@ -1,7 +1,3 @@
 # $FreeBSD$
 
-.if ${MK_NCP} != "no"
-SUBDIR+=	ncplist
-SUBDIR+=	ncplogin
-.endif
 SUBDIR+=	smbutil

Modified: head/usr.sbin/Makefile.amd64
==============================================================================
--- head/usr.sbin/Makefile.amd64	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/usr.sbin/Makefile.amd64	Wed Oct 17 11:16:17 2012	(r241629)
@@ -17,9 +17,6 @@ SUBDIR+=	btxld
 SUBDIR+=	cpucontrol
 SUBDIR+=	kgmon
 SUBDIR+=	lptcontrol
-.if ${MK_NCP} != "no"
-SUBDIR+=	mount_nwfs
-.endif
 SUBDIR+=	mount_smbfs
 SUBDIR+=	mptable
 .if ${MK_NDIS} != "no"

Modified: head/usr.sbin/Makefile.i386
==============================================================================
--- head/usr.sbin/Makefile.i386	Wed Oct 17 10:59:56 2012	(r241628)
+++ head/usr.sbin/Makefile.i386	Wed Oct 17 11:16:17 2012	(r241629)
@@ -12,9 +12,6 @@ SUBDIR+=	cpucontrol
 SUBDIR+=	kgmon
 SUBDIR+=	kgzip
 SUBDIR+=	lptcontrol
-.if ${MK_NCP} != "no"
-SUBDIR+=	mount_nwfs
-.endif
 SUBDIR+=	mount_smbfs
 SUBDIR+=	mptable
 .if ${MK_NDIS} != "no"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210171116.q9HBGHHb057721>