Date: Thu, 18 Oct 2012 12:04:56 +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: r241680 - in head: etc/defaults etc/mtree include lib lib/libprocstat rescue/rescue sbin/mount share/examples share/examples/etc share/mk sys/conf sys/kern sys/modules sys/sys usr.bin u... Message-ID: <201210181204.q9IC4uZJ029510@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Thu Oct 18 12:04:56 2012 New Revision: 241680 URL: http://svn.freebsd.org/changeset/base/241680 Log: Disconnect non-MPSAFE SMBFS from the build in preparation for dropping GIANT from VFS. In addition, disconnect also netsmb, which is a base requirement for SMBFS. In the while SMBFS regular users can use FUSE interface and smbnetfs port to work with their SMBFS partitions. Also, there are ongoing efforts by vendor to support in-kernel smbfs, so there are good chances that it will get relinked once properly locked. This is not targeted for MFC. Modified: 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/examples/etc/README.examples head/share/mk/bsd.libnames.mk head/sys/conf/NOTES head/sys/conf/files head/sys/conf/files.amd64 head/sys/conf/files.arm head/sys/conf/files.i386 head/sys/conf/files.ia64 head/sys/conf/files.mips head/sys/conf/files.pc98 head/sys/conf/files.powerpc head/sys/conf/files.sparc64 head/sys/conf/options head/sys/kern/Make.tags.inc head/sys/kern/sys_generic.c head/sys/modules/Makefile head/sys/sys/socketvar.h head/usr.bin/Makefile.amd64 head/usr.bin/Makefile.i386 head/usr.bin/Makefile.ia64 head/usr.bin/Makefile.powerpc head/usr.bin/Makefile.sparc64 head/usr.bin/kdump/kdump.c head/usr.sbin/Makefile.amd64 head/usr.sbin/Makefile.i386 head/usr.sbin/Makefile.ia64 head/usr.sbin/Makefile.powerpc head/usr.sbin/Makefile.sparc64 Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Thu Oct 18 10:29:16 2012 (r241679) +++ head/etc/defaults/rc.conf Thu Oct 18 12:04:56 2012 (r241680) @@ -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" # Net filesystems. +netfs_types="nfs:NFS oldnfs:OLDNFS" # 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 Thu Oct 18 10:29:16 2012 (r241679) +++ head/etc/mtree/BSD.include.dist Thu Oct 18 12:04:56 2012 (r241680) @@ -170,8 +170,6 @@ .. procfs .. - smbfs - .. udf .. unionfs Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Thu Oct 18 10:29:16 2012 (r241679) +++ head/etc/mtree/BSD.usr.dist Thu Oct 18 12:04:56 2012 (r241680) @@ -307,10 +307,6 @@ srcs .. .. - smbfs - print - .. - .. sunrpc dir .. Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Thu Oct 18 10:29:16 2012 (r241679) +++ head/include/Makefile Thu Oct 18 12:04:56 2012 (r241680) @@ -34,7 +34,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set. ucontext.h LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ - netipsec ${_netipx} netnatm netsmb \ + netipsec ${_netipx} netnatm \ nfs nfsclient nfsserver \ sys vm @@ -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/nullfs \ - fs/procfs fs/smbfs fs/udf fs/unionfs \ + fs/procfs 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 \ @@ -76,7 +76,6 @@ INCS+= iconv.h LSUBSUBDIRS+= netgraph/bluetooth/include .endif -# XXX unconditionally needed by <netsmb/netbios.h> #.if ${MK_IPX} != "no" _netipx= netipx #.endif Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Thu Oct 18 10:29:16 2012 (r241679) +++ head/lib/Makefile Thu Oct 18 12:04:56 2012 (r241680) @@ -100,7 +100,6 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_librtld_db} \ ${_libsdp} \ ${_libsm} \ - ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ libstand \ @@ -188,7 +187,6 @@ _libypclnt= libypclnt .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -_libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db @@ -196,7 +194,6 @@ _librtld_db= librtld_db .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi -_libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "mips" @@ -204,14 +201,6 @@ _libproc= libproc _librtld_db= librtld_db .endif -.if ${MACHINE_CPUARCH} == "powerpc" -_libsmb= libsmb -.endif - -.if ${MACHINE_CPUARCH} == "sparc64" -_libsmb= libsmb -.endif - .if ${MK_OPENSSL} != "no" _libmp= libmp .endif Modified: head/lib/libprocstat/Makefile ============================================================================== --- head/lib/libprocstat/Makefile Thu Oct 18 10:29:16 2012 (r241679) +++ head/lib/libprocstat/Makefile Thu Oct 18 12:04:56 2012 (r241680) @@ -8,7 +8,6 @@ SRCS= cd9660.c \ common_kvm.c \ libprocstat.c \ msdosfs.c \ - smbfs.c \ udf.c VERSION_DEF= ${.CURDIR}/Versions.def Modified: head/lib/libprocstat/common_kvm.h ============================================================================== --- head/lib/libprocstat/common_kvm.h Thu Oct 18 10:29:16 2012 (r241679) +++ head/lib/libprocstat/common_kvm.h Thu Oct 18 12:04:56 2012 (r241680) @@ -41,7 +41,6 @@ int devfs_filestat(kvm_t *kd, struct vno 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 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); int zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); Modified: head/lib/libprocstat/libprocstat.c ============================================================================== --- head/lib/libprocstat/libprocstat.c Thu Oct 18 10:29:16 2012 (r241679) +++ head/lib/libprocstat/libprocstat.c Thu Oct 18 12:04:56 2012 (r241680) @@ -973,7 +973,6 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s FSTYPE(isofs), FSTYPE(msdosfs), FSTYPE(nfs), - FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), #ifdef LIBPROCSTAT_ZFS Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Thu Oct 18 10:29:16 2012 (r241679) +++ head/rescue/rescue/Makefile Thu Oct 18 12:04:56 2012 (r241680) @@ -130,8 +130,6 @@ CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv - .if ${MACHINE_CPUARCH} == "i386" CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk CRUNCH_ALIAS_bsdlabel= disklabel -#CRUNCH_PROGS+= mount_smbfs -#CRUNCH_LIBS+= -lsmb .endif .if ${MACHINE} == "pc98" Modified: head/sbin/mount/mount.8 ============================================================================== --- head/sbin/mount/mount.8 Thu Oct 18 10:29:16 2012 (r241679) +++ head/sbin/mount/mount.8 Thu Oct 18 12:04:56 2012 (r241680) @@ -448,7 +448,6 @@ However, for the following file system t .Cm nfs , .Cm nullfs , .Cm oldnfs , -.Cm smbfs , .Cm udf , and .Cm unionfs . @@ -543,7 +542,6 @@ support for a particular file system mig .Xr mount_msdosfs 8 , .Xr mount_nfs 8 , .Xr mount_nullfs 8 , -.Xr mount_smbfs 8 , .Xr mount_udf 8 , .Xr mount_unionfs 8 , .Xr umount 8 , Modified: head/sbin/mount/mount.c ============================================================================== --- head/sbin/mount/mount.c Thu Oct 18 10:29:16 2012 (r241679) +++ head/sbin/mount/mount.c Thu Oct 18 12:04:56 2012 (r241680) @@ -143,7 +143,7 @@ use_mountprog(const char *vfstype) unsigned int i; const char *fs[] = { "cd9660", "mfs", "msdosfs", "nfs", - "nullfs", "oldnfs", "smbfs", "udf", "unionfs", + "nullfs", "oldnfs", "udf", "unionfs", NULL }; Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Thu Oct 18 10:29:16 2012 (r241679) +++ head/share/examples/Makefile Thu Oct 18 12:04:56 2012 (r241680) @@ -242,7 +242,6 @@ etc-examples: .endif .if ${SHARED} != "symlinks" -SUBDIR= smbfs .if ${MK_IPFILTER} != "no" SUBDIR+=ipfilter .endif Modified: head/share/examples/etc/README.examples ============================================================================== --- head/share/examples/etc/README.examples Thu Oct 18 10:29:16 2012 (r241679) +++ head/share/examples/etc/README.examples Thu Oct 18 12:04:56 2012 (r241680) @@ -40,7 +40,6 @@ netstart - network startup script run fr network.subr - routines for network configuration scripts networks - see networks(5) newsyslog.conf - configuration for system log file rotator newsyslog(8) -nsmb.conf - smbfs lookups configuration file opieaccess - OPIE database of trusted networks pf.conf - pf(4) example configuration file pf.os - SYN fingerprint database Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Thu Oct 18 10:29:16 2012 (r241679) +++ head/share/mk/bsd.libnames.mk Thu Oct 18 12:04:56 2012 (r241680) @@ -143,7 +143,6 @@ LIBRT?= ${DESTDIR}${LIBDIR}/librt.a LIBRTLD_DB?= ${DESTDIR}${LIBDIR}/librtld_db.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a -LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/NOTES Thu Oct 18 12:04:56 2012 (r241680) @@ -573,12 +573,6 @@ options IPX #IPX/SPX communications p options NETATALK #Appletalk communications protocols options NETATALKDEBUG #Appletalk debugging -# -# SMB/CIFS requester -# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV -# options. -options NETSMB #SMB/CIFS requester - # mchain library. It can be either loaded as KLD or compiled into kernel options LIBMCHAIN @@ -1010,7 +1004,6 @@ options NULLFS #NULL filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options PSEUDOFS_TRACE #Debugging support for PSEUDOFS -options SMBFS #SMB/CIFS filesystem options TMPFS #Efficient memory filesystem options UDF #Universal Disk Format options UNIONFS #Union filesystem Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files Thu Oct 18 12:04:56 2012 (r241680) @@ -517,8 +517,8 @@ crypto/blowfish/bf_ecb.c optional ipsec crypto/blowfish/bf_skey.c optional crypto | ipsec crypto/camellia/camellia.c optional crypto | ipsec crypto/camellia/camellia-api.c optional crypto | ipsec -crypto/des/des_ecb.c optional crypto | ipsec | netsmb -crypto/des/des_setkey.c optional crypto | ipsec | netsmb +crypto/des/des_ecb.c optional crypto | ipsec +crypto/des/des_setkey.c optional crypto | ipsec crypto/rc4/rc4.c optional netgraph_mppc_encryption | kgssapi crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \ ipsec | random | wlan_ccmp @@ -2386,12 +2386,6 @@ fs/pseudofs/pseudofs.c optional pseudof fs/pseudofs/pseudofs_fileno.c optional pseudofs fs/pseudofs/pseudofs_vncache.c optional pseudofs fs/pseudofs/pseudofs_vnops.c optional pseudofs -fs/smbfs/smbfs_io.c optional smbfs -fs/smbfs/smbfs_node.c optional smbfs -fs/smbfs/smbfs_smb.c optional smbfs -fs/smbfs/smbfs_subr.c optional smbfs -fs/smbfs/smbfs_vfsops.c optional smbfs -fs/smbfs/smbfs_vnops.c optional smbfs fs/udf/osta.c optional udf fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_vfsops.c optional udf @@ -2626,7 +2620,6 @@ kern/kern_uuid.c standard kern/kern_xxx.c standard kern/link_elf.c standard kern/linker_if.m standard -kern/md4c.c optional netsmb kern/md5c.c standard kern/p1003_1b.c standard kern/posix4_mib.c standard @@ -3155,15 +3148,6 @@ netpfil/pf/pf_osfp.c optional pf inet netpfil/pf/pf_ruleset.c optional pf inet netpfil/pf/pf_table.c optional pf inet netpfil/pf/in4_cksum.c optional pf inet -netsmb/smb_conn.c optional netsmb -netsmb/smb_crypt.c optional netsmb -netsmb/smb_dev.c optional netsmb -netsmb/smb_iod.c optional netsmb -netsmb/smb_rq.c optional netsmb -netsmb/smb_smb.c optional netsmb -netsmb/smb_subr.c optional netsmb -netsmb/smb_trantcp.c optional netsmb -netsmb/smb_usr.c optional netsmb nfs/bootp_subr.c optional bootp nfsclient | bootp nfscl nfs/krpc_subr.c optional bootp nfsclient | bootp nfscl nfs/nfs_common.c optional nfsclient | nfsserver Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.amd64 Thu Oct 18 12:04:56 2012 (r241680) @@ -136,7 +136,7 @@ crypto/aesni/aeskeys_amd64.S optional ae crypto/aesni/aesni.c optional aesni crypto/aesni/aesni_wrap.c optional aesni crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/des/des_enc.c optional crypto | ipsec crypto/via/padlock.c optional padlock crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.arm Thu Oct 18 12:04:56 2012 (r241680) @@ -5,7 +5,7 @@ font.h optional sc \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/des/des_enc.c optional crypto | ipsec arm/arm/autoconf.c standard arm/arm/bcopy_page.S standard arm/arm/bcopyinout.S standard Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.i386 Thu Oct 18 12:04:56 2012 (r241680) @@ -122,7 +122,7 @@ crypto/aesni/aesencdec_i386.S optional a crypto/aesni/aeskeys_i386.S optional aesni crypto/aesni/aesni.c optional aesni crypto/aesni/aesni_wrap.c optional aesni -crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb +crypto/des/arch/i386/des_enc.S optional crypto | ipsec crypto/via/padlock.c optional padlock crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock Modified: head/sys/conf/files.ia64 ============================================================================== --- head/sys/conf/files.ia64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.ia64 Thu Oct 18 12:04:56 2012 (r241680) @@ -45,7 +45,7 @@ contrib/ia64/libuwx/src/uwx_trace.c sta contrib/ia64/libuwx/src/uwx_uinfo.c standard contrib/ia64/libuwx/src/uwx_utable.c standard crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/des/des_enc.c optional crypto | ipsec dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc Modified: head/sys/conf/files.mips ============================================================================== --- head/sys/conf/files.mips Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.mips Thu Oct 18 12:04:56 2012 (r241680) @@ -65,7 +65,7 @@ mips/mips/swtch.S standard mips/mips/uio_machdep.c standard mips/mips/uma_machdep.c standard crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/des/des_enc.c optional crypto | ipsec geom/geom_bsd.c optional geom_bsd geom/geom_bsd_enc.c optional geom_bsd geom/geom_mbr.c optional geom_mbr Modified: head/sys/conf/files.pc98 ============================================================================== --- head/sys/conf/files.pc98 Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.pc98 Thu Oct 18 12:04:56 2012 (r241680) @@ -77,7 +77,7 @@ bf_enc.o optional crypto | ipsec \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule -crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb +crypto/des/arch/i386/des_enc.S optional crypto | ipsec dev/agp/agp_ali.c optional agp dev/agp/agp_amd.c optional agp dev/agp/agp_i810.c optional agp Modified: head/sys/conf/files.powerpc ============================================================================== --- head/sys/conf/files.powerpc Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.powerpc Thu Oct 18 12:04:56 2012 (r241680) @@ -18,7 +18,7 @@ font.h optional sc \ cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc compile-with "${ZFS_C}" cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S optional zfs powerpc64 compile-with "${ZFS_S}" crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/des/des_enc.c optional crypto | ipsec dev/bm/if_bm.c optional bm powermac dev/adb/adb_bus.c optional adb dev/adb/adb_kbd.c optional adb Modified: head/sys/conf/files.sparc64 ============================================================================== --- head/sys/conf/files.sparc64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/files.sparc64 Thu Oct 18 12:04:56 2012 (r241680) @@ -24,7 +24,7 @@ ukbdmap.h optional ukbd_dflt_keymap \ # cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}" crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb +crypto/des/des_enc.c optional crypto | ipsec dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/conf/options Thu Oct 18 12:04:56 2012 (r241680) @@ -216,7 +216,6 @@ NULLFS opt_dontuse.h PROCFS opt_dontuse.h PSEUDOFS opt_dontuse.h REISERFS opt_dontuse.h -SMBFS opt_dontuse.h TMPFS opt_dontuse.h UDF opt_dontuse.h UNIONFS opt_dontuse.h @@ -282,9 +281,6 @@ UFS_GJOURNAL opt_ufs.h # they won't make any difference yet). NFS_ROOT opt_nfsroot.h -# SMB/CIFS requester -NETSMB opt_netsmb.h - # Options used only in subr_param.c. HZ opt_param.h MAXFILES opt_param.h Modified: head/sys/kern/Make.tags.inc ============================================================================== --- head/sys/kern/Make.tags.inc Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/kern/Make.tags.inc Thu Oct 18 12:04:56 2012 (r241680) @@ -30,7 +30,6 @@ COMM= ${SYS}/dev/advansys/*.[ch] \ ${SYS}/fs/msdosfs/*.[ch] \ ${SYS}/fs/nullfs/*.[ch] \ ${SYS}/fs/procfs/*.[ch] \ - ${SYS}/fs/smbfs/*.[ch] \ ${SYS}/fs/udf/*.[ch] \ ${SYS}/fs/unionfs/*.[ch] \ ${SYS}/geom/*.[ch] \ Modified: head/sys/kern/sys_generic.c ============================================================================== --- head/sys/kern/sys_generic.c Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/kern/sys_generic.c Thu Oct 18 12:04:56 2012 (r241680) @@ -1474,62 +1474,6 @@ sys_openbsd_poll(td, uap) } /* - * XXX This was created specifically to support netncp and netsmb. This - * allows the caller to specify a socket to wait for events on. It returns - * 0 if any events matched and an error otherwise. There is no way to - * determine which events fired. - */ -int -selsocket(struct socket *so, int events, struct timeval *tvp, struct thread *td) -{ - struct timeval atv, rtv, ttv; - int error, timo; - - if (tvp != NULL) { - atv = *tvp; - if (itimerfix(&atv)) - return (EINVAL); - getmicrouptime(&rtv); - timevaladd(&atv, &rtv); - } else { - atv.tv_sec = 0; - atv.tv_usec = 0; - } - - timo = 0; - seltdinit(td); - /* - * Iterate until the timeout expires or the socket becomes ready. - */ - for (;;) { - selfdalloc(td, NULL); - error = sopoll(so, events, NULL, td); - /* error here is actually the ready events. */ - if (error) - return (0); - if (atv.tv_sec || atv.tv_usec) { - getmicrouptime(&rtv); - if (timevalcmp(&rtv, &atv, >=)) { - seltdclear(td); - return (EWOULDBLOCK); - } - ttv = atv; - timevalsub(&ttv, &rtv); - timo = ttv.tv_sec > 24 * 60 * 60 ? - 24 * 60 * 60 * hz : tvtohz(&ttv); - } - error = seltdwait(td, timo); - seltdclear(td); - if (error) - break; - } - /* XXX Duplicates ncp/smb behavior. */ - if (error == ERESTART) - error = 0; - return (error); -} - -/* * Preallocate two selfds associated with 'cookie'. Some fo_poll routines * have two select sets, one for read and another for write. */ Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/modules/Makefile Thu Oct 18 12:04:56 2012 (r241680) @@ -295,7 +295,6 @@ SUBDIR= \ siis \ sis \ sk \ - ${_smbfs} \ ${_sn} \ ${_snc} \ snp \ @@ -514,7 +513,6 @@ _rdma= rdma _safe= safe _sbni= sbni _scsi_low= scsi_low -_smbfs= smbfs _sound= sound _speaker= speaker _splash= splash @@ -712,7 +710,6 @@ _s3= s3 _safe= safe _scsi_low= scsi_low _sfxge= sfxge -_smbfs= smbfs _sound= sound _speaker= speaker _splash= splash @@ -768,7 +765,6 @@ _ips= ips _mly= mly _pccard= pccard _scsi_low= scsi_low -_smbfs= smbfs _sound= sound _splash= splash _sppp= sppp @@ -790,7 +786,6 @@ _cpufreq= cpufreq _exca= exca _nvram= powermac_nvram _pccard= pccard -_smbfs= smbfs _sound= sound .endif @@ -812,7 +807,6 @@ _igb= igb .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _opensolaris= opensolaris .endif -_smbfs= smbfs _sound= sound .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs Modified: head/sys/sys/socketvar.h ============================================================================== --- head/sys/sys/socketvar.h Thu Oct 18 10:29:16 2012 (r241679) +++ head/sys/sys/socketvar.h Thu Oct 18 12:04:56 2012 (r241680) @@ -368,8 +368,6 @@ void soupcall_clear(struct socket *so, i void soupcall_set(struct socket *so, int which, int (*func)(struct socket *, void *, int), void *arg); void sowakeup(struct socket *so, struct sockbuf *sb); -int selsocket(struct socket *so, int events, struct timeval *tv, - struct thread *td); /* * Accept filter functions (duh). Modified: head/usr.bin/Makefile.amd64 ============================================================================== --- head/usr.bin/Makefile.amd64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.bin/Makefile.amd64 Thu Oct 18 12:04:56 2012 (r241680) @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil Modified: head/usr.bin/Makefile.i386 ============================================================================== --- head/usr.bin/Makefile.i386 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.bin/Makefile.i386 Thu Oct 18 12:04:56 2012 (r241680) @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil Modified: head/usr.bin/Makefile.ia64 ============================================================================== --- head/usr.bin/Makefile.ia64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.bin/Makefile.ia64 Thu Oct 18 12:04:56 2012 (r241680) @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil Modified: head/usr.bin/Makefile.powerpc ============================================================================== --- head/usr.bin/Makefile.powerpc Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.bin/Makefile.powerpc Thu Oct 18 12:04:56 2012 (r241680) @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil Modified: head/usr.bin/Makefile.sparc64 ============================================================================== --- head/usr.bin/Makefile.sparc64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.bin/Makefile.sparc64 Thu Oct 18 12:04:56 2012 (r241680) @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.bin/kdump/kdump.c Thu Oct 18 12:04:56 2012 (r241680) @@ -1420,8 +1420,6 @@ ktrsockaddr(struct sockaddr *sa) TODO: Support additional address families #include <netnatm/natm.h> struct sockaddr_natm *natm; - #include <netsmb/netbios.h> - struct sockaddr_nb *nb; */ char addr[64]; Modified: head/usr.sbin/Makefile.amd64 ============================================================================== --- head/usr.sbin/Makefile.amd64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.sbin/Makefile.amd64 Thu Oct 18 12:04:56 2012 (r241680) @@ -17,7 +17,6 @@ SUBDIR+= btxld SUBDIR+= cpucontrol SUBDIR+= kgmon SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt Modified: head/usr.sbin/Makefile.i386 ============================================================================== --- head/usr.sbin/Makefile.i386 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.sbin/Makefile.i386 Thu Oct 18 12:04:56 2012 (r241680) @@ -12,7 +12,6 @@ SUBDIR+= cpucontrol SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt Modified: head/usr.sbin/Makefile.ia64 ============================================================================== --- head/usr.sbin/Makefile.ia64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.sbin/Makefile.ia64 Thu Oct 18 12:04:56 2012 (r241680) @@ -4,6 +4,5 @@ SUBDIR+= acpi .endif SUBDIR+= kgmon -SUBDIR+= mount_smbfs SUBDIR:= ${SUBDIR:Nuathload} SUBDIR+= zzz Modified: head/usr.sbin/Makefile.powerpc ============================================================================== --- head/usr.sbin/Makefile.powerpc Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.sbin/Makefile.powerpc Thu Oct 18 12:04:56 2012 (r241680) @@ -1,5 +1,4 @@ # $FreeBSD$ -SUBDIR+= mount_smbfs SUBDIR+= nvram SUBDIR+= ofwdump Modified: head/usr.sbin/Makefile.sparc64 ============================================================================== --- head/usr.sbin/Makefile.sparc64 Thu Oct 18 10:29:16 2012 (r241679) +++ head/usr.sbin/Makefile.sparc64 Thu Oct 18 12:04:56 2012 (r241680) @@ -1,7 +1,6 @@ # $FreeBSD$ SUBDIR+= eeprom -SUBDIR+= mount_smbfs SUBDIR+= ofwdump .if ${MK_SYSINSTALL} != "no" SUBDIR+= sade
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210181204.q9IC4uZJ029510>