Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25189643 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: remove the sockopt= mount option 



...as promised for 3.9.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c483a984

fs/cifs/connect.c

+1 −15
Original line number Diff line number Diff line
@@ -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)