diff options
| author | Jeff Layton <jlayton@redhat.com> | 2013-02-21 06:32:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2013-03-06 18:48:59 -0600 |
| commit | 25189643a165a5ccad48ee3c116b55905299fd3d (patch) | |
| tree | 97a0ab9cebcee42dcd7832a6904cef58159725b4 | |
| parent | c483a9841df1de327e01af7deb6ba349210e5f82 (diff) | |
| download | blackbird-op-linux-25189643a165a5ccad48ee3c116b55905299fd3d.tar.gz blackbird-op-linux-25189643a165a5ccad48ee3c116b55905299fd3d.zip | |
cifs: remove the sockopt= mount option
...as promised for 3.9.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/connect.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 54125e04fd0c..991c63c6bdd0 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -97,7 +97,7 @@ enum { Opt_user, Opt_pass, Opt_ip, Opt_unc, Opt_domain, Opt_srcaddr, Opt_prefixpath, - Opt_iocharset, Opt_sockopt, + Opt_iocharset, Opt_netbiosname, Opt_servern, 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_prefixpath, "prefixpath=%s" }, { Opt_iocharset, "iocharset=%s" }, - { Opt_sockopt, "sockopt=%s" }, { Opt_netbiosname, "netbiosname=%s" }, { Opt_servern, "servern=%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); 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: string = match_strdup(args); if (string == NULL) |
