diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-01-19 04:49:35 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-01-29 04:32:13 +0100 |
| commit | da505c386c9f993e43861791dae339b2219cf8dd (patch) | |
| tree | 177baffca259f9c9a68cb08892df9c011afd407c /fs/cifs/connect.c | |
| parent | [CIFS] some cleanup to dir.c prior to addition of posix_open (diff) | |
| download | linux-da505c386c9f993e43861791dae339b2219cf8dd.tar.xz linux-da505c386c9f993e43861791dae339b2219cf8dd.zip | |
[CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases
We have used approximately 15 second timeouts on nonblocking sends in the past, and
also 15 second SMB timeout (waiting for server responses, for most request types).
Now that we can do blocking tcp sends,
make blocking send timeout approximately the same (15 seconds).
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 7419576228fb..a3537a90a9d9 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1802,7 +1802,7 @@ ipv4_connect(struct TCP_Server_Info *server) * user space buffer */ socket->sk->sk_rcvtimeo = 7 * HZ; - socket->sk->sk_sndtimeo = 3 * HZ; + socket->sk->sk_sndtimeo = 5 * HZ; /* make the bufsizes depend on wsize/rsize and max requests */ if (server->noautotune) { @@ -1953,7 +1953,7 @@ ipv6_connect(struct TCP_Server_Info *server) * user space buffer */ socket->sk->sk_rcvtimeo = 7 * HZ; - socket->sk->sk_sndtimeo = 3 * HZ; + socket->sk->sk_sndtimeo = 5 * HZ; server->ssocket = socket; return rc; |