From 2e564269d0af3703815a10effe03c1f1773c9a46 Mon Sep 17 00:00:00 2001 From: Attilio Rao Date: Thu, 18 Oct 2012 12:04:56 +0000 Subject: [PATCH] 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. --- etc/defaults/rc.conf | 2 +- etc/mtree/BSD.include.dist | 2 -- etc/mtree/BSD.usr.dist | 4 --- include/Makefile | 5 ++- lib/Makefile | 11 ------ lib/libprocstat/Makefile | 1 - lib/libprocstat/common_kvm.h | 1 - lib/libprocstat/libprocstat.c | 1 - rescue/rescue/Makefile | 2 -- sbin/mount/mount.8 | 2 -- sbin/mount/mount.c | 2 +- share/examples/Makefile | 1 - share/examples/etc/README.examples | 1 - share/mk/bsd.libnames.mk | 1 - sys/conf/NOTES | 7 ---- sys/conf/files | 20 ++--------- sys/conf/files.amd64 | 2 +- sys/conf/files.arm | 2 +- sys/conf/files.i386 | 2 +- sys/conf/files.ia64 | 2 +- sys/conf/files.mips | 2 +- sys/conf/files.pc98 | 2 +- sys/conf/files.powerpc | 2 +- sys/conf/files.sparc64 | 2 +- sys/conf/options | 4 --- sys/kern/Make.tags.inc | 1 - sys/kern/sys_generic.c | 56 ------------------------------ sys/modules/Makefile | 6 ---- sys/sys/socketvar.h | 2 -- usr.bin/Makefile.amd64 | 1 - usr.bin/Makefile.i386 | 1 - usr.bin/Makefile.ia64 | 1 - usr.bin/Makefile.powerpc | 1 - usr.bin/Makefile.sparc64 | 1 - usr.bin/kdump/kdump.c | 2 -- usr.sbin/Makefile.amd64 | 1 - usr.sbin/Makefile.i386 | 1 - usr.sbin/Makefile.ia64 | 1 - usr.sbin/Makefile.powerpc | 1 - usr.sbin/Makefile.sparc64 | 1 - 40 files changed, 14 insertions(+), 146 deletions(-) diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 98c89e49e97..0efaaa15da6 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" # 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). diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 5a2b6aed7bb..81f0e5bf57d 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -170,8 +170,6 @@ .. procfs .. - smbfs - .. udf .. unionfs diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index bc3f4e758b2..83d20a890e8 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -307,10 +307,6 @@ srcs .. .. - smbfs - print - .. - .. sunrpc dir .. diff --git a/include/Makefile b/include/Makefile index 03a085f960a..161dcf05836 100644 --- a/include/Makefile +++ b/include/Makefile @@ -34,7 +34,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ 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 #.if ${MK_IPX} != "no" _netipx= netipx #.endif diff --git a/lib/Makefile b/lib/Makefile index ae2592473e2..431abf4f287 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -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 diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index fade43b97b0..a29afc7a7d8 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -8,7 +8,6 @@ SRCS= cd9660.c \ common_kvm.c \ libprocstat.c \ msdosfs.c \ - smbfs.c \ udf.c VERSION_DEF= ${.CURDIR}/Versions.def diff --git a/lib/libprocstat/common_kvm.h b/lib/libprocstat/common_kvm.h index 06627bff448..d5e08e1cfc0 100644 --- a/lib/libprocstat/common_kvm.h +++ b/lib/libprocstat/common_kvm.h @@ -41,7 +41,6 @@ int devfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); 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); diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 7ff1d53c63a..9d9c111f7d8 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -973,7 +973,6 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst, FSTYPE(isofs), FSTYPE(msdosfs), FSTYPE(nfs), - FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), #ifdef LIBPROCSTAT_ZFS diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index b6173533915..62db656ca75 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -130,8 +130,6 @@ CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lsbuf -lufs -lz .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" diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index cda2f4c06d5..6bc4b5cc565 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -448,7 +448,6 @@ However, for the following file system types: .Cm nfs , .Cm nullfs , .Cm oldnfs , -.Cm smbfs , .Cm udf , and .Cm unionfs . @@ -543,7 +542,6 @@ support for a particular file system might be provided either on a static .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 , diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index a69c673f071..1984eaced0f 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", - "nullfs", "oldnfs", "smbfs", "udf", "unionfs", + "nullfs", "oldnfs", "udf", "unionfs", NULL }; diff --git a/share/examples/Makefile b/share/examples/Makefile index 9502e9e4fe1..d3fab14b276 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -242,7 +242,6 @@ etc-examples: .endif .if ${SHARED} != "symlinks" -SUBDIR= smbfs .if ${MK_IPFILTER} != "no" SUBDIR+=ipfilter .endif diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index f7bf4ceb8cf..d703edbf568 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -40,7 +40,6 @@ netstart - network startup script run from /etc/rc 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 diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index aa78dd8509a..f74959f6a26 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -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 diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 3d1d9e94fa6..f16bf70b9e8 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -573,12 +573,6 @@ options IPX #IPX/SPX communications protocols 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 diff --git a/sys/conf/files b/sys/conf/files index 4d18d7f9ed7..197956c5fc6 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 pseudofs 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 diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 66f7df64679..fec31f77990 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -136,7 +136,7 @@ crypto/aesni/aeskeys_amd64.S optional aesni 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 diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 84ca8faca79..775dfcb0e5d 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -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 diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index aaddfde605b..d4df01d554c 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -122,7 +122,7 @@ crypto/aesni/aesencdec_i386.S optional aesni 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 diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index 7bedb0817d1..a039a4278b2 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -45,7 +45,7 @@ contrib/ia64/libuwx/src/uwx_trace.c standard 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 diff --git a/sys/conf/files.mips b/sys/conf/files.mips index bc628d58579..ff44986c93b 100644 --- a/sys/conf/files.mips +++ b/sys/conf/files.mips @@ -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 diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index a8e60b6f729..252ecdddeac 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -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 diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index e1ccf094c6d..cbf181341bf 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -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 diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 2907dd0408c..9232ea23106 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -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 diff --git a/sys/conf/options b/sys/conf/options index 894d2823274..84e0c0ef1a6 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -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 diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index cb8a3ff993e..81205a6b429 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -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] \ diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index cfaf9fc61a2..f47cb0332e7 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1473,62 +1473,6 @@ sys_openbsd_poll(td, uap) return (sys_poll(td, (struct poll_args *)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. diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 6ec6ba98265..aa546c153f9 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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 diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 94c3b24e5c3..b4d01dc46b4 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -368,8 +368,6 @@ void soupcall_clear(struct socket *so, int which); 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). diff --git a/usr.bin/Makefile.amd64 b/usr.bin/Makefile.amd64 index fee2fb07681..b720e3de68b 100644 --- a/usr.bin/Makefile.amd64 +++ b/usr.bin/Makefile.amd64 @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil diff --git a/usr.bin/Makefile.i386 b/usr.bin/Makefile.i386 index fee2fb07681..b720e3de68b 100644 --- a/usr.bin/Makefile.i386 +++ b/usr.bin/Makefile.i386 @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil diff --git a/usr.bin/Makefile.ia64 b/usr.bin/Makefile.ia64 index fee2fb07681..b720e3de68b 100644 --- a/usr.bin/Makefile.ia64 +++ b/usr.bin/Makefile.ia64 @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil diff --git a/usr.bin/Makefile.powerpc b/usr.bin/Makefile.powerpc index fee2fb07681..b720e3de68b 100644 --- a/usr.bin/Makefile.powerpc +++ b/usr.bin/Makefile.powerpc @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil diff --git a/usr.bin/Makefile.sparc64 b/usr.bin/Makefile.sparc64 index fee2fb07681..b720e3de68b 100644 --- a/usr.bin/Makefile.sparc64 +++ b/usr.bin/Makefile.sparc64 @@ -1,3 +1,2 @@ # $FreeBSD$ -SUBDIR+= smbutil diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 73fef94f8c8..bd3ceab6717 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1420,8 +1420,6 @@ ktrsockaddr(struct sockaddr *sa) TODO: Support additional address families #include struct sockaddr_natm *natm; - #include - struct sockaddr_nb *nb; */ char addr[64]; diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index 2856da23ce9..26eb2b03c48 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -17,7 +17,6 @@ SUBDIR+= btxld SUBDIR+= cpucontrol SUBDIR+= kgmon SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index 800626c06a4..9588eb815f0 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -12,7 +12,6 @@ SUBDIR+= cpucontrol SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol -SUBDIR+= mount_smbfs SUBDIR+= mptable .if ${MK_NDIS} != "no" SUBDIR+= ndiscvt diff --git a/usr.sbin/Makefile.ia64 b/usr.sbin/Makefile.ia64 index 0a897b40b31..d047b337515 100644 --- a/usr.sbin/Makefile.ia64 +++ b/usr.sbin/Makefile.ia64 @@ -4,6 +4,5 @@ SUBDIR+= acpi .endif SUBDIR+= kgmon -SUBDIR+= mount_smbfs SUBDIR:= ${SUBDIR:Nuathload} SUBDIR+= zzz diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc index 8833a2741e1..131eb571cdc 100644 --- a/usr.sbin/Makefile.powerpc +++ b/usr.sbin/Makefile.powerpc @@ -1,5 +1,4 @@ # $FreeBSD$ -SUBDIR+= mount_smbfs SUBDIR+= nvram SUBDIR+= ofwdump diff --git a/usr.sbin/Makefile.sparc64 b/usr.sbin/Makefile.sparc64 index 320226d0599..479dafc6cfe 100644 --- a/usr.sbin/Makefile.sparc64 +++ b/usr.sbin/Makefile.sparc64 @@ -1,7 +1,6 @@ # $FreeBSD$ SUBDIR+= eeprom -SUBDIR+= mount_smbfs SUBDIR+= ofwdump .if ${MK_SYSINSTALL} != "no" SUBDIR+= sade