diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 2391bc7ad31f13441735ec0f6c656e51ec0527d6..3c194279982bc19ac82aefd3f47efbb3e7e1fe65 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,7 +2,7 @@ tbd Cluster File Systems, Inc. <info@clusterfs.com> * version 1.6.4 * Support for kernels: 2.6.5-7.286 (SLES 9), - 2.6.9-55.0.2.EL (RHEL 4), + 2.6.9-55.0.6.EL (RHEL 4), 2.6.16.46-0.14 (SLES 10), 2.6.18-8.1.10.el5 (RHEL 5), 2.6.18.8 vanilla (kernel.org) @@ -88,6 +88,10 @@ Details : If LAST_ID value on disk is smaller than the objects existing in LBUG(). If the object is 0-length, then we should use the existing object. This will help to avoid a full fsck in most cases. +Severity : normal +Bugzilla : 13518 +Description: Kernel patches update for RHEL4 2.6.9-55.0.6. +Details : Modify vm-tunables-rhel4.patch. -------------------------------------------------------------------------------- diff --git a/lustre/kernel_patches/patches/vm-tunables-rhel4.patch b/lustre/kernel_patches/patches/vm-tunables-rhel4.patch index 7e4a9d615e30ab8ece44e3d889bc392a13784c38..db2460b21721b3ac0338c1f0350e67677b8ea036 100644 --- a/lustre/kernel_patches/patches/vm-tunables-rhel4.patch +++ b/lustre/kernel_patches/patches/vm-tunables-rhel4.patch @@ -17,57 +17,3 @@ Index: linux+rhel4+chaos/mm/page_alloc.c spin_unlock_irqrestore(&zone->lru_lock, flags); } } -@@ -1982,24 +1986,25 @@ static void setup_per_zone_pages_min(voi - * Initialise min_free_kbytes. - * - * For small machines we want it small (128k min). For large machines -- * we want it large (16MB max). But it is not linear, because network -+ * we want it large (64MB max). But it is not linear, because network - * bandwidth does not increase linearly with machine size. We use - * -- * min_free_kbytes = sqrt(lowmem_kbytes) -+ * min_free_kbytes = 4 * sqrt(lowmem_kbytes), for better accuracy -+ * min_free_kbytes = sqrt(lowmem_kbytes * 16) - * - * which yields - * -- * 16MB: 128k -- * 32MB: 181k -- * 64MB: 256k -- * 128MB: 362k -- * 256MB: 512k -- * 512MB: 724k -- * 1024MB: 1024k -- * 2048MB: 1448k -- * 4096MB: 2048k -- * 8192MB: 2896k -- * 16384MB: 4096k -+ * 16MB: 512k -+ * 32MB: 724k -+ * 64MB: 1024k -+ * 128MB: 1448k -+ * 256MB: 2048k -+ * 512MB: 2896k -+ * 1024MB: 4096k -+ * 2048MB: 5792k -+ * 4096MB: 8192k -+ * 8192MB: 11584k -+ * 16384MB: 16384k - */ - static int __init init_per_zone_pages_min(void) - { -@@ -2007,11 +2012,11 @@ static int __init init_per_zone_pages_mi - - lowmem_kbytes = nr_free_buffer_pages() * (PAGE_SIZE >> 10); - -- min_free_kbytes = int_sqrt(lowmem_kbytes); -+ min_free_kbytes = int_sqrt(lowmem_kbytes * 16); - if (min_free_kbytes < 128) - min_free_kbytes = 128; -- if (min_free_kbytes > 16384) -- min_free_kbytes = 16384; -+ if (min_free_kbytes > 65536) -+ min_free_kbytes = 65536; - setup_per_zone_pages_min(); - setup_per_zone_protection(); - return 0; diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in index 68128a0d7cd40d4a4b89458f9b2e6c256da2aaa3..43e00218896462f36457bc370fd6f9cf012842fa 100644 --- a/lustre/kernel_patches/targets/2.6-rhel4.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.9" -lnxrel="55.0.2.EL" +lnxrel="55.0.6.EL" KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2 SERIES=2.6-rhel4.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 3705195cdbbc0b07c1a7fd75724e553404d3497d..edbe77d0643167480d1e10ac95440416703afae7 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -3,7 +3,7 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: 2.6-suse SLES9 before SP1 already in SLES9 SP1 kernel 2.6-suse-newer SLES9: 2.6.5-7.286 extra patches for SLES9 after SP1 -2.6-rhel4 RHEL4: 2.6.9-55.0.2.EL +2.6-rhel4 RHEL4: 2.6.9-55.0.6.EL 2.6-sles10 SLES10: 2.6.16.46-0.14 2.6-rhel5.series RHEL5: 2.6.18-8.1.10.el5 2.6.18-vanilla.series kernel.org: 2.6.18.8