From ff99631753002a8e4c8125d50d1e1eb53e0a0b28 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:15:31 +0200 Subject: [PATCH] linux: Remove CIFS timeout patch We longer use CIFS in the VM tests so we don't need this anymore. --- .../linux/kernel/cifs-timeout-2.6.38.patch | 13 ------------- pkgs/os-specific/linux/kernel/patches.nix | 8 -------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 22 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch deleted file mode 100644 index 8168ffb5a1af..000000000000 --- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch +++ /dev/null @@ -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; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d9bd6f2c9342..42f1be071f9d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3ced7dbc397..bc212974836c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6380,7 +6380,6 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 - kernelPatches.cifs_timeout_2_6_38 ]; };