cifs: add deprecation warning to sockopt=TCP_NODELAY option

Now that we're using TCP_CORK on the socket, there's no value in
continuting to support this option. Schedule it for removal in 3.9.

Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Jeff Layton <jlayton@redhat.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 5210bc82b1dc..443e39633107 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1680,12 +1680,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                         if (string == NULL)
                                 goto out_nomem;
 
-                        /*
-                         * FIXME: since we now cork/uncork the socket while
-                         *        sending, should we deprecate this option?
-                         */
-                        if (strnicmp(string, "TCP_NODELAY", 11) == 0)
+                        if (strnicmp(string, "TCP_NODELAY", 11) == 0) {
+                                printk(KERN_WARNING "CIFS: the "
+                                        "sockopt=TCP_NODELAY option has been "
+                                        "deprecated and will be removed "
+                                        "in 3.9\n");
                                 vol->sockopt_tcp_nodelay = 1;
+                        }
                         break;
                 case Opt_netbiosname:
                         string = match_strdup(args);