---

yaml --- r: 201726 b: refs/heads/master c: f636a34 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · e3e7c07 · e3e7c07
1 parent eb65587
commit e3e7c07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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) ||