Commit 939cbe5a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: remove smbfs 



smbfs got moved to staging in 2.6.37, so we can
finally remove it in the 2.6.39 merge window.
All users should by now have migrated to cifs.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: linux-cifs@vger.kernel.org
Cc: Jeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 561c5cf9

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ source "drivers/staging/msm/Kconfig" 


source "drivers/staging/lirc/Kconfig"



source "drivers/staging/smbfs/Kconfig"



source "drivers/staging/easycap/Kconfig"



source "drivers/staging/solo6x10/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ obj-$(CONFIG_POHMELFS) += pohmelfs/ 
obj-$(CONFIG_IDE_PHISON)	+= phison/

obj-$(CONFIG_LINE6_USB)		+= line6/

obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/

obj-$(CONFIG_SMB_FS)		+= smbfs/

obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)	+= quatech_usb2/

obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/

obj-$(CONFIG_VT6655)		+= vt6655/

drivers/staging/smbfs/Kconfig

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
config SMB_FS

	tristate "SMB file system support (OBSOLETE, please use CIFS)"

	depends on BKL # probably unfixable

	depends on INET

	select NLS

	help

	  SMB (Server Message Block) is the protocol Windows for Workgroups

	  (WfW), Windows 95/98, Windows NT and OS/2 Lan Manager use to share

	  files and printers over local networks.  Saying Y here allows you to

	  mount their file systems (often called "shares" in this context) and

	  access them just like any other Unix directory.  Currently, this

	  works only if the Windows machines use TCP/IP as the underlying

	  transport protocol, and not NetBEUI.  For details, read

	  <file:Documentation/filesystems/smbfs.txt> and the SMB-HOWTO,

	  available from <http://www.tldp.org/docs.html#howto>.



	  Note: if you just want your box to act as an SMB *server* and make

	  files and printing services available to Windows clients (which need

	  to have a TCP/IP stack), you don't need to say Y here; you can use

	  the program SAMBA (available from <ftp://ftp.samba.org/pub/samba/>)

	  for that.



	  General information about how to connect Linux, Windows machines and

	  Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.



	  To compile the SMB support as a module, choose M here:

	  the module will be called smbfs.  Most people say N, however.



config SMB_NLS_DEFAULT

	bool "Use a default NLS"

	depends on SMB_FS

	help

	  Enabling this will make smbfs use nls translations by default. You

	  need to specify the local charset (CONFIG_NLS_DEFAULT) in the nls

	  settings and you need to give the default nls for the SMB server as

	  CONFIG_SMB_NLS_REMOTE.



	  The nls settings can be changed at mount time, if your smbmount

	  supports that, using the codepage and iocharset parameters.



	  smbmount from samba 2.2.0 or later supports this.



config SMB_NLS_REMOTE

	string "Default Remote NLS Option"

	depends on SMB_NLS_DEFAULT

	default "cp437"

	help

	  This setting allows you to specify a default value for which

	  codepage the server uses. If this field is left blank no

	  translations will be done by default. The local codepage/charset

	  default to CONFIG_NLS_DEFAULT.



	  The nls settings can be changed at mount time, if your smbmount

	  supports that, using the codepage and iocharset parameters.



	  smbmount from samba 2.2.0 or later supports this.

drivers/staging/smbfs/Makefile

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
#

# Makefile for the linux smb-filesystem routines.

#



obj-$(CONFIG_SMB_FS) += smbfs.o



smbfs-y := proc.o dir.o cache.o sock.o inode.o file.o ioctl.o getopt.o \

		symlink.o smbiod.o request.o



# If you want debugging output, you may add these flags to the EXTRA_CFLAGS

# SMBFS_PARANOIA should normally be enabled.



ccflags-y := -DSMBFS_PARANOIA

#ccflags-y += -DSMBFS_DEBUG

#ccflags-y += -DSMBFS_DEBUG_VERBOSE

#ccflags-y += -DDEBUG_SMB_TIMESTAMP

#ccflags-y += -Werror

drivers/staging/smbfs/TODO

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
smbfs is on its way out of the kernel, it has been replaced

by cifs several years ago.



The smbfs code uses the big kernel lock which

is getting deprecated.



Users that find smbfs to work but not cifs should contact

the CIFS developers on linux-cifs@vger.kernel.org.