From 5ed30654d5a0099cca7e755a0f96103ef28c7115 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 21 Feb 2013 06:32:59 -0500
Subject: [PATCH] --- yaml --- r: 360991 b: refs/heads/master c:
 25189643a165a5ccad48ee3c116b55905299fd3d h: refs/heads/master i:   360989:
 56f6b925334855489d5d301ced5ea3789a935b67   360987:
 21ff05d017c8ca54834a0ce023e88f33c55f6bc4   360983:
 6546a1130578665838ae016204bcbad0f6c3af0c   360975:
 d497fefb4c80a6714f75dc6b75f5109e8eac36c0   360959:
 b167cdde10c3dd90a1334c3b5e4ced17befe8ed3 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/cifs/connect.c | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index e9fb2df417f8..790a0b3f6eaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c483a9841df1de327e01af7deb6ba349210e5f82
+refs/heads/master: 25189643a165a5ccad48ee3c116b55905299fd3d
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 54125e04fd0c..991c63c6bdd0 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/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)