---

yaml --- r: 308797 b: refs/heads/master c: 09983b2 h: refs/heads/master i: 308795: ec46442 v: v3
git-mirror · May 17, 2012 · 63c11dd · 63c11dd
1 parent 608d6ba
commit 63c11dd
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: 15b6a47322940beb74a83ffc1632c1ee1d00f35b
+refs/heads/master: 09983b2fab80fa037b1dcf9a11de5a70df59ef7f
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
@@ -1457,10 +1457,16 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 		case Opt_direct:
 			vol->direct_io = true;
 			vol->strict_io = false;
+			cERROR(1, "The \"directio\" option will be removed in "
+				  "3.7. Please switch to the \"cache=none\" "
+				  "option.");
 			break;
 		case Opt_strictcache:
 			vol->direct_io = false;
 			vol->strict_io = true;
+			cERROR(1, "The \"strictcache\" option will be removed "
+				"in 3.7. Please switch to the \"cache=strict\" "
+				"option.");
 			break;
 		case Opt_noac:
 			printk(KERN_WARNING "CIFS: Mount option noac not "