lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cifs: remove the sockopt= mount option

Browse Source 
...as promised for 3.9.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Jeff Layton
2013-02-21 06:32:59 -05:00
committed by Steve French
parent c483a9841d
commit 25189643a1
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/cifs/connect.c
View File

@@ -97,7 +97,7 @@ enum {
Opt_user, Opt_pass, Opt_ip, Opt_user, Opt_pass, Opt_ip,
Opt_unc, Opt_domain, Opt_unc, Opt_domain,
Opt_srcaddr, Opt_prefixpath, Opt_srcaddr, Opt_prefixpath,
Opt_iocharset, Opt_sockopt, Opt_iocharset,
Opt_netbiosname, Opt_servern, Opt_netbiosname, Opt_servern,
Opt_ver, Opt_vers, Opt_sec, Opt_cache, Opt_ver, Opt_vers, Opt_sec, Opt_cache,
@@ -202,7 +202,6 @@ static const match_table_t cifs_mount_option_tokens = {
{ Opt_srcaddr, "srcaddr=%s" }, { Opt_srcaddr, "srcaddr=%s" },
{ Opt_prefixpath, "prefixpath=%s" }, { Opt_prefixpath, "prefixpath=%s" },
{ Opt_iocharset, "iocharset=%s" }, { Opt_iocharset, "iocharset=%s" },
{ Opt_sockopt, "sockopt=%s" },
{ Opt_netbiosname, "netbiosname=%s" }, { Opt_netbiosname, "netbiosname=%s" },
{ Opt_servern, "servern=%s" }, { Opt_servern, "servern=%s" },
{ Opt_ver, "ver=%s" }, { Opt_ver, "ver=%s" },
@@ -1752,19 +1751,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
*/ */
cFYI(1, "iocharset set to %s", string); cFYI(1, "iocharset set to %s", string);
break; break;
case Opt_sockopt:
string = match_strdup(args);
if (string == NULL)
goto out_nomem;
if (strnicmp(string, "TCP_NODELAY", 11) == 0) {
printk(KERN_WARNING "CIFS: the "
"sockopt=TCP_NODELAY option has been "
"deprecated and will be removed "
"in 3.9\n");
vol->sockopt_tcp_nodelay = 1;
}
break;
case Opt_netbiosname: case Opt_netbiosname:
string = match_strdup(args); string = match_strdup(args);
if (string == NULL) if (string == NULL)