ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 21:32:23 +03:00
Code Issues Projects Releases Wiki Activity

linux: Remove CIFS timeout patch

Browse Source 
We longer use CIFS in the VM tests so we don't need this anymore.
This commit is contained in:
Eelco Dolstra 2013-08-01 00:15:31 +02:00
parent 956d71f843
commit ff99631753
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +0,0 @@
--- /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;

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

@ -125,14 +125,6 @@ rec {
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_38 =
{ name = "cifs-timeout";
patch = ./cifs-timeout-2.6.38.patch;
features.cifsTimeout = true;
};
no_xsave =
{ name = "no-xsave";
patch = ./no-xsave.patch;

1
pkgs/top-level/all-packages.nix
View File

@ -6380,7 +6380,6 @@ let
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_2
kernelPatches.cifs_timeout_2_6_38
];
};