mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-13 21:32:23 +03:00
linux: Remove CIFS timeout patch
We longer use CIFS in the VM tests so we don't need this anymore.
This commit is contained in:
parent
956d71f843
commit
ff99631753
@ -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;
|
|
@ -125,14 +125,6 @@ rec {
|
|||||||
features.aufs3 = true;
|
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 =
|
no_xsave =
|
||||||
{ name = "no-xsave";
|
{ name = "no-xsave";
|
||||||
patch = ./no-xsave.patch;
|
patch = ./no-xsave.patch;
|
||||||
|
@ -6380,7 +6380,6 @@ let
|
|||||||
kernelPatches =
|
kernelPatches =
|
||||||
[ kernelPatches.sec_perm_2_6_24
|
[ kernelPatches.sec_perm_2_6_24
|
||||||
# kernelPatches.aufs3_2
|
# kernelPatches.aufs3_2
|
||||||
kernelPatches.cifs_timeout_2_6_38
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user