From e3e7c0765bd2c6314c9f708d4ac6bcbe27fbb6e6 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Mon, 26 Jul 2010 10:29:58 -0400 Subject: [PATCH] --- yaml --- r: 201726 b: refs/heads/master c: f636a34802e3913415410c6e595df2bf84851cff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/connect.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 04b9737d2348..4cd19548e330 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3572d2857f61f720082740cc17e2d99b45e7af7f +refs/heads/master: f636a34802e3913415410c6e595df2bf84851cff diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index d91a6085d55c..85a994c6433d 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1264,6 +1264,12 @@ cifs_parse_mount_options(char *options, const char *devname, } else if ((strnicmp(data, "nocase", 6) == 0) || (strnicmp(data, "ignorecase", 10) == 0)) { vol->nocase = 1; + } else if (strnicmp(data, "mand", 4) == 0) { + /* ignore */ + } else if (strnicmp(data, "nomand", 6) == 0) { + /* ignore */ + } else if (strnicmp(data, "_netdev", 7) == 0) { + /* ignore */ } else if (strnicmp(data, "brl", 3) == 0) { vol->nobrl = 0; } else if ((strnicmp(data, "nobrl", 5) == 0) ||