We should do some quick performance runs to verify this - but with
corking and uncorking the socket explicitly presumably TCP_NODELAY
should not be needed.
On Thu, Feb 21, 2013 at 9:37 AM, Scott Lovenberg
<scott.lovenberg@xxxxxxxxx> wrote:
> On Thu, Feb 21, 2013 at 6:32 AM, Jeff Layton <jlayton@xxxxxxxxxx> wrote:
>>
>> ...as promised for 3.9.
>>
>> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
>> ---
>> fs/cifs/connect.c | 16 +---------------
>> 1 file changed, 1 insertion(+), 15 deletions(-)
>>
>> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
>> index d997737..8609c42 100644
>> --- a/fs/cifs/connect.c
>> +++ b/fs/cifs/connect.c
>> @@ -97,7 +97,7 @@ enum {
>> Opt_user, Opt_pass, Opt_ip,
>> Opt_unc, Opt_domain,
>> Opt_srcaddr, Opt_prefixpath,
>> - Opt_iocharset, Opt_sockopt,
>> + Opt_iocharset,
>> Opt_netbiosname, Opt_servern,
>> Opt_ver, Opt_vers, Opt_sec, Opt_cache,
>>
>> @@ -202,7 +202,6 @@ static const match_table_t cifs_mount_option_tokens =
>> {
>> { Opt_srcaddr, "srcaddr=%s" },
>> { Opt_prefixpath, "prefixpath=%s" },
>> { Opt_iocharset, "iocharset=%s" },
>> - { Opt_sockopt, "sockopt=%s" },
>> { Opt_netbiosname, "netbiosname=%s" },
>> { Opt_servern, "servern=%s" },
>> { Opt_ver, "ver=%s" },
>> @@ -1722,19 +1721,6 @@ cifs_parse_mount_options(const char *mountdata,
>> const char *devname,
>> */
>> cFYI(1, "iocharset set to %s", string);
>> break;
>> - case Opt_sockopt:
>> - string = match_strdup(args);
>> - if (string == NULL)
>> - goto out_nomem;
>> -
>> - 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);
>> if (string == NULL)
>
> Gar. Why was TCP_NODELAY pulled? I only ask because I'm updating the
> socket options section of the smb.conf man page. Supposedly NODELAY
> can have great results in some network configurations[citation
> needed].
>
> --
> Peace and Blessings,
> -Scott.
--
Thanks,
Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
