Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b8eed28375a43e1c9aaa9d15af2a052aae0d0725

Authored by Jeff Layton
Committed by Steve French
1 parent 6f49f46b18
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

cifs: cork the socket before a send and uncork it afterward 

We want to send SMBs as "atomically" as possible. Prior to sending any
data on the socket, cork it to make sure that no non-full frames go
out. Afterward, uncork it to make sure all of the data gets pushed out
to the wire.

Note that this more or less renders the socket=TCP_NODELAY mount option
obsolete. When TCP_CORK and TCP_NODELAY are used on the same socket,
TCP_NODELAY is essentially ignored.

Acked-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

Showing 2 changed files with 16 additions and 0 deletions Side-by-side Diff

... ... @@ -1680,6 +1680,10 @@
1680 1680 if (string == NULL)
1681 1681 goto out_nomem;
1682 1682  
  1683 + /*
  1684 + * FIXME: since we now cork/uncork the socket while
  1685 + * sending, should we deprecate this option?
  1686 + */
1683 1687 if (strnicmp(string, "TCP_NODELAY", 11) == 0)
1684 1688 vol->sockopt_tcp_nodelay = 1;
1685 1689 break;
... ... @@ -27,6 +27,7 @@
27 27 #include <linux/net.h>
28 28 #include <linux/delay.h>
29 29 #include <linux/freezer.h>
  30 +#include <linux/tcp.h>
30 31 #include <asm/uaccess.h>
31 32 #include <asm/processor.h>
32 33 #include <linux/mempool.h>
33 34  
34 35  
... ... @@ -247,11 +248,22 @@
247 248 int n_vec = rqst->rq_nvec;
248 249 unsigned int smb_buf_length = get_rfc1002_length(iov[0].iov_base);
249 250 size_t total_len;
  251 + struct socket *ssocket = server->ssocket;
  252 + int val = 1;
250 253  
251 254 cFYI(1, "Sending smb: smb_len=%u", smb_buf_length);
252 255 dump_smb(iov[0].iov_base, iov[0].iov_len);
253 256  
  257 + /* cork the socket */
  258 + kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK,
  259 + (char *)&val, sizeof(val));
  260 +
254 261 rc = smb_send_kvec(server, iov, n_vec, &total_len);
  262 +
  263 + /* uncork it */
  264 + val = 0;
  265 + kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK,
  266 + (char *)&val, sizeof(val));
255 267  
256 268 if ((total_len > 0) && (total_len != smb_buf_length + 4)) {
257 269 cFYI(1, "partial send (wanted=%u sent=%zu): terminating "