Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67c1f529 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

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: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
parent c84ce4a7

fs/cifs/connect.c

+6 −5
Original line number Diff line number Diff line
@@ -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);