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: Steven French <sfrench@us.ibm.com> Signed-off-by: Oleg Verych <olecom@flower.upol.cz> Cc: Jeff Layton <jlayton@redhat.com> Cc: Adrian Bunk <bunk@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9692bd9c14
commit
c773633916
|
@ -1835,7 +1835,7 @@ config RPCSEC_GSS_SPKM3
|
|||
If unsure, say N.
|
||||
|
||||
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
|
||||
select NLS
|
||||
help
|
||||
|
@ -1858,8 +1858,8 @@ config SMB_FS
|
|||
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.
|
||||
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"
|
||||
|
@ -1891,7 +1891,7 @@ config SMB_NLS_REMOTE
|
|||
smbmount from samba 2.2.0 or later supports this.
|
||||
|
||||
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
|
||||
select NLS
|
||||
help
|
||||
|
|
|
@ -500,6 +500,13 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
|
|||
struct smb_fattr root;
|
||||
int ver;
|
||||
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)
|
||||
goto out_no_data;
|
||||
|
|
Loading…
Reference in New Issue
Block a user