All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] cifs: remove the sockopt= mount option
@ 2013-02-21 11:32 Jeff Layton
       [not found] ` <1361446379-7970-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
  2013-03-04 22:08 ` Steve French
  0 siblings, 2 replies; 13+ messages in thread
From: Jeff Layton @ 2013-02-21 11:32 UTC (permalink / raw)
  To: smfrench-Re5JQEeQqe8AvxtiuMwx3w; +Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA

...as promised for 3.9.

Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 fs/cifs/connect.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index d997737..8609c42 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" },
@@ -1722,19 +1721,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)
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2013-03-06 15:24 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-21 11:32 [PATCH] cifs: remove the sockopt= mount option Jeff Layton
     [not found] ` <1361446379-7970-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-02-21 15:37   ` Scott Lovenberg
     [not found]     ` <CAFB9KM0bJo4NpePoe9aWMZGJ_jfk0W41Thefg7MD=_V+VP98Eg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-21 16:00       ` Steve French
     [not found]         ` <CAH2r5mtHsOjXjXx5NdHWNzoTmVmny8gSh_Gd1XfHdNfCOHJDyA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-21 16:27           ` Jeff Layton
     [not found]             ` <20130221112719.2ed40ecf-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2013-02-21 16:31               ` Steve French
     [not found]                 ` <CAH2r5mszydSWqVsGTT3cqe_J2oK+k=4=Ly+hiiPs9eNWsZaVZw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-02-21 17:13                   ` Jeff Layton
2013-02-21 16:29           ` Scott Lovenberg
2013-02-21 16:19       ` Jeff Layton
2013-03-04 22:08 ` Steve French
     [not found]   ` <CAH2r5muojf9w9QxkPK5vCQs5Av_wxm+twJ044+Mf8Q_9D=b63Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-03-06 13:40     ` Jeff Layton
2013-03-06 13:40       ` Jeff Layton
     [not found]       ` <20130306084004.05acd57c-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2013-03-06 15:24         ` Scott Lovenberg
2013-03-06 15:24           ` Scott Lovenberg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.