Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7736339 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

deprecate smbfs in favour of cifs 



smbfs is a bit buggy and has no maintainer.  Change it to shout at the user on
the first five mount attempts - tell them to switch to CIFS.

Come December we'll mark it BROKEN and see what happens.

[olecom@flower.upol.cz: documentation update]
Cc: Urban Widmark <urban@teststation.com>
Acked-by: default avatarSteven French <sfrench@us.ibm.com>
Signed-off-by: default avatarOleg Verych <olecom@flower.upol.cz>
Cc: Jeff Layton <jlayton@redhat.com>
Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9692bd9c

fs/Kconfig

+14 −14
Original line number Original line Diff line number Diff line
@@ -1835,7 +1835,7 @@ config RPCSEC_GSS_SPKM3 
	  If unsure, say N.

	  If unsure, say N.





config SMB_FS

config SMB_FS

	tristate "SMB file system support (to mount Windows shares etc.)"

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

	depends on INET

	depends on INET

	select NLS

	select NLS

	help

	help
@@ -1858,8 +1858,8 @@ config SMB_FS 
	  General information about how to connect Linux, Windows machines and

	  General information about how to connect Linux, Windows machines and

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

	  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

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

	  be called smbfs.  Most people say N, however.

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





config SMB_NLS_DEFAULT

config SMB_NLS_DEFAULT

	bool "Use a default NLS"

	bool "Use a default NLS"
@@ -1891,7 +1891,7 @@ config SMB_NLS_REMOTE 
	  smbmount from samba 2.2.0 or later supports this.

	  smbmount from samba 2.2.0 or later supports this.





config CIFS

config CIFS

	tristate "CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)"

	tristate "CIFS support (advanced network filesystem, SMBFS successor)"

	depends on INET

	depends on INET

	select NLS

	select NLS

	help

	help

fs/smbfs/inode.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -500,6 +500,13 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) 
	struct smb_fattr root;

	struct smb_fattr root;

	int ver;

	int ver;

	void *mem;

	void *mem;

	static int warn_count;



	if (warn_count < 5) {

		warn_count++;

		printk(KERN_EMERG "smbfs is deprecated and will be removed"

			"from the 2.6.27 kernel.  Please migrate to cifs\n");

	}





	if (!raw_data)

	if (!raw_data)

		goto out_no_data;

		goto out_no_data;