cifs: add deprecation warnings to strictcache and forcedirectio

Leave them in for 2 releases and remove for 3.7.

Reviewed-by: Pavel Shilovsky <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 4898759d97cc6be513357d1f8b9dc5a73ef6dda2..34186805e639af24ec37ef5e38f066319ca2e7fe 100644 (file)
--- 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 "