From 5249af32da5330c0bcaf0412a32aa30c5e93e908 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Tue, 15 May 2012 12:04:03 -0400 Subject: [PATCH] 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 --- fs/cifs/connect.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index c49d494..4a6baa8 100644 --- 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; } -- 2.7.4