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

Added CIFS timeout patch for Linux 2.6.15 

svn path=/nixpkgs/trunk/; revision=27715
This commit is contained in:
Ludovic Stordeur 2011-07-11 14:00:01 +00:00
parent e739dc7d6c
commit e381c7c385
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/os-specific/linux/kernel/cifs-timeout-2.6.15.patch Normal file
View File

@ -0,0 +1,44 @@
--- a/fs/cifs/transport.c 2011-04-12 15:16:00.253887813 +0200
+++ b/fs/cifs/transport.c 2011-04-12 15:17:22.650296413 +0200
@@ -247,9 +247,9 @@
n_vec - first_vec, total_len);
if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
i++;
- if(i >= 14) {
+ if(i >= 119) {
cERROR(1,
- ("sends on sock %p stuck for 15 seconds",
+ ("sends on sock %p stuck for 120 seconds",
ssocket));
rc = -EAGAIN;
break;
@@ -421,12 +421,12 @@
else if (long_op == 2) /* writes past end of file can take loong time */
timeout = 180 * HZ;
else if (long_op == 1)
- 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 > 2) {
timeout = MAX_SCHEDULE_TIMEOUT;
} else
- 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 */
if (signal_pending(current)) {
@@ -687,12 +687,12 @@
else if (long_op == 2) /* writes past end of file can take loong time */
timeout = 180 * HZ;
else if (long_op == 1)
- 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 > 2) {
timeout = MAX_SCHEDULE_TIMEOUT;
} else
- 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 */
if (signal_pending(current)) {

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

@ -235,6 +235,12 @@ rec {
# Increase the timeout on CIFS requests from 15 to 120 seconds to # Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server. # make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =
{ name = "cifs-timeout";
patch = ./cifs-timeout-2.6.15.patch;
features.cifsTimeout = true;
};
cifs_timeout_2_6_25 = cifs_timeout_2_6_25 =
{ name = "cifs-timeout"; { name = "cifs-timeout";
patch = ./cifs-timeout-2.6.25.patch; patch = ./cifs-timeout-2.6.25.patch;