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

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

cifs: remove the vers= and version= synonyms for ver= 



We want these to mean something different entirely, and the mount.cifs
helper only ever passed in ver= automatically. Also, don't allow
ver=cifs anymore since that was never passed in by the mount helper.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
parent 296838b1

fs/cifs/connect.c

+1 −4
Original line number Diff line number Diff line
@@ -210,8 +210,6 @@ static const match_table_t cifs_mount_option_tokens = { 
	{ Opt_netbiosname, "netbiosname=%s" },

	{ Opt_servern, "servern=%s" },

	{ Opt_ver, "ver=%s" },

	{ Opt_ver, "vers=%s" },

	{ Opt_ver, "version=%s" },

	{ Opt_sec, "sec=%s" },

	{ Opt_cache, "cache=%s" },
@@ -1874,8 +1872,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			if (string == NULL)

				goto out_nomem;



			if (strnicmp(string, "cifs", 4) == 0 ||

			    strnicmp(string, "1", 1) == 0) {

			if (strnicmp(string, "1", 1) == 0) {

				/* This is the default */

				break;

			}