diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2012-10-17 11:16:17 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2012-10-17 11:16:17 +0000 |
| commit | e6116d5b8e55f021844ac2331aa533a1a114fc8f (patch) | |
| tree | a36bb1b48615302d343a7afd78f6ea19a6b64b3e /lib | |
| parent | edb085b8ab5551373a0cddf306e11a0d51efdd2d (diff) | |
| download | src-e6116d5b8e55f021844ac2331aa533a1a114fc8f.tar.gz src-e6116d5b8e55f021844ac2331aa533a1a114fc8f.zip | |
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.
Notes
Notes:
svn path=/head/; revision=241629
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 4 | ||||
| -rw-r--r-- | lib/libprocstat/Makefile | 5 | ||||
| -rw-r--r-- | lib/libprocstat/common_kvm.h | 1 | ||||
| -rw-r--r-- | lib/libprocstat/libprocstat.c | 3 |
4 files changed, 0 insertions, 13 deletions
diff --git a/lib/Makefile b/lib/Makefile index a366f5f84c7f..ae2592473e2d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -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 diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index 98044834a193..d125898be26c 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -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 diff --git a/lib/libprocstat/common_kvm.h b/lib/libprocstat/common_kvm.h index d0b5307a007e..781863ac7b71 100644 --- a/lib/libprocstat/common_kvm.h +++ b/lib/libprocstat/common_kvm.h @@ -42,7 +42,6 @@ int isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); 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); diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 11a817e090d2..425aadff7fc9 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -974,9 +974,6 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst, FSTYPE(msdosfs), FSTYPE(nfs), FSTYPE(ntfs), -#ifdef LIBPROCSTAT_NWFS - FSTYPE(nwfs), -#endif FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), |