summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-05-16 13:53:00 +0200
committerSteve French <sfrench@us.ibm.com>2012-05-17 03:13:32 +0200
commit09983b2fab80fa037b1dcf9a11de5a70df59ef7f (patch)
treec381e151414e42c130d1987bc0638ae9a51b6418 /fs
parentcifs: add a cache= option to better describe the different cache flavors (diff)
downloadlinux-09983b2fab80fa037b1dcf9a11de5a70df59ef7f.tar.xz
linux-09983b2fab80fa037b1dcf9a11de5a70df59ef7f.zip
cifs: add deprecation warnings to strictcache and forcedirectio
Leave them in for 2 releases and remove for 3.7. Reviewed-by: Pavel Shilovsky <piastry@etersoft.ru> Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/connect.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 4898759d97cc..34186805e639 100644
--- a/fs/cifs/connect.c
+++ b/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 "