From: adilger <adilger>
Date: Fri, 23 Jul 2004 06:52:19 +0000 (+0000)
Subject: Merge b1_4_smallfix from b1_4 (20040722_1843) (mballoc)
X-Git-Tag: v1_7_100~1^36~14
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=63ab544e93137883468b88882b8a7deb1987cae6;p=fs%2Flustre-release.git

Merge b1_4_smallfix from b1_4 (20040722_1843) (mballoc)
- ext3 exents and multi-block allocation (3024)
- service time statistics in /proc
- minor fixes to liblustre build (3317)
---

diff --git a/lustre/kernel_patches/series/chaos-2.4.21 b/lustre/kernel_patches/series/chaos-2.4.21
index c70c22e..1ad9b99 100644
--- a/lustre/kernel_patches/series/chaos-2.4.21
+++ b/lustre/kernel_patches/series/chaos-2.4.21
@@ -1,6 +1,6 @@
 configurable-x86-stack-2.4.21-chaos.patch 
 dev_read_only_2.4.21-chaos.patch 
-exports_2.4.19-suse.patch
+exports-2.4.21-chaos.patch 
 lustre_version.patch
 vfs_intent-2.4.21-chaos.patch 
 invalidate_show-2.4.20-rh.patch
@@ -35,3 +35,6 @@ pagecache-lock-2.4.21-chaos.patch
 ext3-truncate-buffer-head.patch
 inode-max-readahead-2.4.24.patch
 dcache_refcount_debug.patch
+ext3-extents-2.4.21-chaos.patch 
+ext3-extents-asyncdel-2.4.21-chaos.patch 
+ext3-mballoc-2.4.21-chaos.patch