Skip to content

Commit

Permalink
cifs: add deprecation warning to sockopt=TCP_NODELAY option
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff Layton authored and Steve French committed Sep 25, 2012
1 parent c84ce4a commit 67c1f52
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions fs/cifs/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 67c1f52

Please sign in to comment.