- merge b_devel into b_proto (incl b_swab changes)

- fix leak-all-bulk-pages bug
- Mike fixed a bug where a failed ptlrpc_queue_wait send buf would
  fail, but the user would still have to wait for the timeout to pass
  before being able to interrupt

diff --git a/lustre/kernel_patches/patches/exports_2.4.20.patch b/lustre/kernel_patches/patches/exports_2.4.20.patch
index 6332735..d9a0755 100644 (file)
--- a/lustre/kernel_patches/patches/exports_2.4.20.patch
+++ b/lustre/kernel_patches/patches/exports_2.4.20.patch
@@ -1,14 +1,11 @@
-
-
-
  fs/ext3/Makefile   |    2 ++
  fs/ext3/super.c    |    2 +-
  include/linux/fs.h |    1 +
- kernel/ksyms.c     |    4 ++++
- 4 files changed, 8 insertions(+), 1 deletion(-)
+ kernel/ksyms.c     |    5 +++++
+ 4 files changed, 9 insertions(+), 1 deletion(-)
 
---- linux-2.4.20-hp4_pnnl1/fs/ext3/Makefile~exports_hp Tue Apr  1 20:36:07 2003
-+++ linux-2.4.20-hp4_pnnl1-braam/fs/ext3/Makefile      Tue Apr  1 20:36:07 2003
+--- linux-chaos-2.4.20-6/fs/ext3/Makefile~exports_2.4.20       2002-05-07 15:53:46.000000000 -0600
++++ linux-chaos-2.4.20-6-braam/fs/ext3/Makefile        2003-04-09 16:10:26.000000000 -0600
 @@ -9,6 +9,8 @@
  
  O_TARGET := ext3.o
@@ -18,9 +15,9 @@
  obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
                ioctl.o namei.o super.o symlink.o
  obj-m    := $(O_TARGET)
---- linux-2.4.20-hp4_pnnl1/fs/ext3/super.c~exports_hp  Tue Apr  1 20:36:07 2003
-+++ linux-2.4.20-hp4_pnnl1-braam/fs/ext3/super.c       Tue Apr  1 20:36:07 2003
-@@ -1769,7 +1769,7 @@
+--- linux-chaos-2.4.20-6/fs/ext3/super.c~exports_2.4.20        2003-03-12 12:51:02.000000000 -0700
++++ linux-chaos-2.4.20-6-braam/fs/ext3/super.c 2003-04-09 16:10:26.000000000 -0600
+@@ -1770,7 +1770,7 @@ static void __exit exit_ext3_fs(void)
        unregister_filesystem(&ext3_fs_type);
  }
  
@@ -29,9 +26,9 @@
  
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
---- linux-2.4.20-hp4_pnnl1/include/linux/fs.h~exports_hp       Tue Apr  1 20:36:07 2003
-+++ linux-2.4.20-hp4_pnnl1-braam/include/linux/fs.h    Tue Apr  1 20:36:52 2003
-@@ -1020,6 +1020,7 @@
+--- linux-chaos-2.4.20-6/include/linux/fs.h~exports_2.4.20     2003-03-12 12:51:27.000000000 -0700
++++ linux-chaos-2.4.20-6-braam/include/linux/fs.h      2003-04-09 16:10:26.000000000 -0600
+@@ -1026,6 +1026,7 @@ extern int unregister_filesystem(struct 
  extern struct vfsmount *kern_mount(struct file_system_type *);
  extern int may_umount(struct vfsmount *);
  extern long do_mount(char *, char *, char *, unsigned long, void *);
@@ -39,9 +36,9 @@
  
  #define kern_umount mntput
  
---- linux-2.4.20-hp4_pnnl1/kernel/ksyms.c~exports_hp   Tue Apr  1 20:36:07 2003
-+++ linux-2.4.20-hp4_pnnl1-braam/kernel/ksyms.c        Tue Apr  1 20:36:07 2003
-@@ -308,6 +308,11 @@
+--- linux-chaos-2.4.20-6/kernel/ksyms.c~exports_2.4.20 2003-03-12 12:51:36.000000000 -0700
++++ linux-chaos-2.4.20-6-braam/kernel/ksyms.c  2003-04-09 16:10:26.000000000 -0600
+@@ -313,6 +313,11 @@ EXPORT_SYMBOL(dcache_dir_fsync);
  EXPORT_SYMBOL(dcache_readdir);
  EXPORT_SYMBOL(dcache_dir_ops);
  

diff --git a/lustre/kernel_patches/series/hp-pnnl-2.4.20 b/lustre/kernel_patches/series/hp-pnnl-2.4.20
index c5a895d..9de9ee0 100644 (file)
--- a/lustre/kernel_patches/series/hp-pnnl-2.4.20
+++ b/lustre/kernel_patches/series/hp-pnnl-2.4.20
@@ -6,3 +6,16 @@ vfs_intent_hp.patch
 invalidate_show.patch
 export-truncate.patch
 iod-stock-24-exports_hp.patch
+ext-2.4-patch-1.patch
+ext-2.4-patch-2.patch
+ext-2.4-patch-3.patch
+ext-2.4-patch-4.patch
+linux-2.4.20-xattr-0.8.54-hp.patch
+ext3-2.4.20-fixes.patch
+ext3-2.4-ino_t.patch
+ext3-largefile.patch
+ext3-truncate_blocks.patch
+ext3-unmount_sync.patch
+ext3-use-after-free.patch
+extN-wantedi.patch
+extN-san.patch

diff --git a/lustre/kernel_patches/series/hp-pnnl-2.4.20.orig b/lustre/kernel_patches/series/hp-pnnl-2.4.20.orig
deleted file mode 100644 (file)
index bf276fb..0000000
--- a/lustre/kernel_patches/series/hp-pnnl-2.4.20.orig
+++ /dev/null
@@ -1,8 +0,0 @@
-dev_read_only_hp.patch
-exports_hp.patch
-kmem_cache_validate_hp.patch
-jbd-transno-cb.patch
-lustre_version.patch
-vfs_intent_hp.patch
-invalidate_show.patch
-iod-stock-24-exports_hp.patch

diff --git a/lustre/kernel_patches/series/rh-2.4.20 b/lustre/kernel_patches/series/rh-2.4.20
index 0d8331d..da09386 100644 (file)
--- a/lustre/kernel_patches/series/rh-2.4.20
+++ b/lustre/kernel_patches/series/rh-2.4.20
@@ -6,5 +6,11 @@ vfs_intent-2.4.20.patch
 invalidate_show.patch
 iod-rmap-exports-2.4.20.patch
 export-truncate.patch
-uml_check_get_page.patch
-uml_no_panic.patch
+ext-2.4-patch-1-chaos.patch
+ext-2.4-patch-2.patch
+ext-2.4-patch-3.patch
+ext-2.4-patch-4.patch
+linux-2.4.20-xattr-0.8.54-chaos.patch
+ext3-2.4.20-fixes.patch
+extN-wantedi.patch
+extN-san.patch