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: Jeff Layton <jlayton@redhat.com>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index c49d49438c52ce677ca2cd67d3863afc5c694300..4a6baa880506f6d76a2402bd97553ee1c5ccf947 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -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;
                        }