JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added CIFS timeout patch for Linux 2.6.{35 --> 38}

Browse Source 
svn path=/nixpkgs/trunk/; revision=27710
This commit is contained in:
Ludovic Stordeur 2011-07-11 13:59:43 +00:00
parent df0a6394b3
commit c551998c82
3 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/os-specific/linux/kernel/cifs-timeout-2.6.35.patch Normal file
View File

@ -0,0 +1,45 @@
--- /tmp/linux-2.6.32.14/fs/cifs/transport.c 2010-11-22 20:01:26.000000000 +0100
+++ linux-2.6.32.14/fs/cifs/transport.c 2011-03-29 15:31:14.926510480 +0200
@@ -166,8 +166,8 @@
after the retries we will kill the socket and
reconnect which may clear the network problem.
*/
- if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
- cERROR(1, "sends on sock %p stuck for 15 seconds",
+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
+ cERROR(1, "sends on sock %p stuck for 119 seconds",
ssocket);
rc = -EAGAIN;
break;
@@ -458,11 +458,11 @@
goto out;
if (long_op == CIFS_STD_OP)
- timeout = 15 * HZ;
+ timeout = 120 * HZ;
else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */
timeout = 180 * HZ;
else if (long_op == CIFS_LONG_OP)
- timeout = 45 * HZ; /* should be greater than
+ timeout = 120 * HZ; /* should be greater than
servers oplock break timeout (about 43 seconds) */
else if (long_op == CIFS_ASYNC_OP)
goto out;
@@ -650,7 +650,7 @@
goto out;
if (long_op == CIFS_STD_OP)
- timeout = 15 * HZ;
+ timeout = 120 * HZ;
/* wait for 15 seconds or until woken up due to response arriving or
due to last connection to this server being unmounted */
else if (long_op == CIFS_ASYNC_OP)
@@ -658,7 +658,7 @@
else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */
timeout = 180 * HZ;
else if (long_op == CIFS_LONG_OP)
- timeout = 45 * HZ; /* should be greater than
+ timeout = 120 * HZ; /* should be greater than
servers oplock break timeout (about 43 seconds) */
else if (long_op == CIFS_BLOCKING_OP)
timeout = 0x7FFFFFFF; /* large but no so large as to wrap */

13
pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch Normal file
View File

@ -0,0 +1,13 @@
--- /tmp/linux-2.6.32.14/fs/cifs/transport.c 2011-03-27 20:37:20.000000000 +0200
+++ linux-2.6.32.14/fs/cifs/transport.c 2011-04-01 11:07:17.700305670 +0200
@@ -182,8 +182,8 @@
after the retries we will kill the socket and
reconnect which may clear the network problem.
*/
- if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
- cERROR(1, "sends on sock %p stuck for 15 seconds",
+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
+ cERROR(1, "sends on sock %p stuck for 119 seconds",
ssocket);
rc = -EAGAIN;
break;

12
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -241,6 +241,18 @@ rec {
features.cifsTimeout = true; features.cifsTimeout = true;
}; };
cifs_timeout_2_6_35 =
{ name = "cifs-timeout";
patch = ./cifs-timeout-2.6.35.patch;
features.cifsTimeout = true;
};
cifs_timeout_2_6_38 =
{ name = "cifs-timeout";
patch = ./cifs-timeout-2.6.38.patch;
features.cifsTimeout = true;
};
cifs_timeout = cifs_timeout_2_6_32; cifs_timeout = cifs_timeout_2_6_32;
no_xsave = no_xsave =