From b260600ac51792ea8c7a1225ff0099d3b3c9a76b Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 16 May 2012 07:53:01 -0400
Subject: [PATCH] --- yaml --- r: 308799 b: refs/heads/master c:
 296838b182ebad919074bf324e1667d28a04b936 h: refs/heads/master i:   308797:
 63c11ddff144b89d281becf5c0a539a3e8f8fc45   308795:
 ec46442070b675fae79ad601c20a28ea37ddacf1   308791:
 57d82515734061147d89a39320ef4ad10cd8941d   308783:
 d8c709c30e48881652a7fed5b169358c34711fff   308767:
 950624bcb1acd4d36a73977be26945b09646945d   308735:
 3a272cbf4d8804389c99dfc8f36c7b47b68a3c0d v: v3

---
 [refs]                  |  2 +-
 trunk/fs/cifs/connect.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 477bb5a025c1..a853a1c06004 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d06b5056ae160453c4be17e24e8cf08d65f4569f
+refs/heads/master: 296838b182ebad919074bf324e1667d28a04b936
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 34186805e639..c49d49438c52 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -1244,6 +1244,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 	char *string = NULL;
 	char *tmp_end, *value;
 	char delim;
+	bool cache_specified = false;
+	static bool cache_warned = false;
 
 	separator[0] = ',';
 	separator[1] = 0;
@@ -1455,6 +1457,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 			vol->seal = 1;
 			break;
 		case Opt_direct:
+			cache_specified = true;
 			vol->direct_io = true;
 			vol->strict_io = false;
 			cERROR(1, "The \"directio\" option will be removed in "
@@ -1462,6 +1465,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 				  "option.");
 			break;
 		case Opt_strictcache:
+			cache_specified = true;
 			vol->direct_io = false;
 			vol->strict_io = true;
 			cERROR(1, "The \"strictcache\" option will be removed "
@@ -1888,6 +1892,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 				goto cifs_parse_mount_err;
 			break;
 		case Opt_cache:
+			cache_specified = true;
 			string = match_strdup(args);
 			if (string == NULL)
 				goto out_nomem;
@@ -1938,6 +1943,14 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 		printk(KERN_NOTICE "CIFS: ignoring forcegid mount option "
 				   "specified with no gid= option.\n");
 
+	/* FIXME: remove this block in 3.7 */
+	if (!cache_specified && !cache_warned) {
+		cache_warned = true;
+		printk(KERN_NOTICE "CIFS: no cache= option specified, using "
+				   "\"cache=loose\". This default will change "
+				   "to \"cache=strict\" in 3.7.\n");
+	}
+
 	kfree(mountdata_copy);
 	return 0;