diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-05-15 18:04:03 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-05-17 03:13:34 +0200 |
| commit | 5249af32da5330c0bcaf0412a32aa30c5e93e908 (patch) | |
| tree | 759d6843a483dd323bda78c8c34f42cedfece6ee /fs/cifs/connect.c | |
| parent | cifs: add warning about change in default cache semantics in 3.7 (diff) | |
| download | linux-5249af32da5330c0bcaf0412a32aa30c5e93e908.tar.xz linux-5249af32da5330c0bcaf0412a32aa30c5e93e908.zip | |
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>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index c49d49438c52..4a6baa880506 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; } |