partial merge of b_open into b_devel:

 - Lustre kernel patch version 16
 - extN no longer built; ext3 patched as part of the kernel patch
 - related changes to lconf/lmc, to load and mkfs ext3 instead of extN now

diff --git a/lustre/kernel_patches/patches/dev_read_only_hp.patch b/lustre/kernel_patches/patches/dev_read_only_hp.patch
index b2cf6f0..0d3476c 100644 (file)
--- a/lustre/kernel_patches/patches/dev_read_only_hp.patch
+++ b/lustre/kernel_patches/patches/dev_read_only_hp.patch
@@ -1,14 +1,16 @@
- drivers/block/blkpg.c  |   38 ++++++++++++++++++++++++++++++++++++++
- drivers/block/loop.c   |    5 +++++
- drivers/ide/ide-disk.c |    6 ++++++
- 3 files changed, 49 insertions(+)
+ drivers/block/blkpg.c  |   39 +++++++++++++++++++++++++++++++++++++++
+ drivers/block/loop.c   |    3 +++
+ drivers/ide/ide-disk.c |    4 ++++
+ 3 files changed, 46 insertions(+)
 
---- linux-2.4.19-hp2_pnnl2/drivers/block/blkpg.c~dev_read_only_hp      Sun Jan 19 18:51:12 2003
-+++ linux-2.4.19-hp2_pnnl2-root/drivers/block/blkpg.c  Sun Jan 19 18:52:28 2003
-@@ -310,6 +310,42 @@ int blk_ioctl(kdev_t dev, unsigned int c
+--- linux-2.4.20/drivers/block/blkpg.c~dev_read_only_hp        2003-04-09 15:14:54.000000000 -0600
++++ linux-2.4.20-braam/drivers/block/blkpg.c   2003-04-09 15:37:02.000000000 -0600
+@@ -296,3 +296,42 @@ int blk_ioctl(kdev_t dev, unsigned int c
+ }
  
  EXPORT_SYMBOL(blk_ioctl);
- 
++
++  
 +
 +#define NUM_DEV_NO_WRITE 16
 +static int dev_no_write[NUM_DEV_NO_WRITE];
@@ -45,11 +47,9 @@
 +EXPORT_SYMBOL(dev_check_rdonly);
 +EXPORT_SYMBOL(dev_clear_rdonly);
 +
- /**
-  * get_last_sector()
-  *  
---- linux-2.4.19-hp2_pnnl2/drivers/block/loop.c~dev_read_only_hp       Sun Jan 19 18:51:12 2003
-+++ linux-2.4.19-hp2_pnnl2-root/drivers/block/loop.c   Sun Jan 19 18:51:12 2003
++
+--- linux-2.4.20/drivers/block/loop.c~dev_read_only_hp 2003-04-09 15:14:54.000000000 -0600
++++ linux-2.4.20-braam/drivers/block/loop.c    2003-04-09 15:37:02.000000000 -0600
 @@ -474,6 +474,9 @@ static int loop_make_request(request_que
        spin_unlock_irq(&lo->lo_lock);
  
@@ -60,9 +60,9 @@
                if (lo->lo_flags & LO_FLAGS_READ_ONLY)
                        goto err;
        } else if (rw == READA) {
---- linux-2.4.19-hp2_pnnl2/drivers/ide/ide-disk.c~dev_read_only_hp     Sun Jan 19 18:51:12 2003
-+++ linux-2.4.19-hp2_pnnl2-root/drivers/ide/ide-disk.c Sun Jan 19 18:51:12 2003
-@@ -551,6 +551,10 @@ static ide_startstop_t lba_48_rw_disk (i
+--- linux-2.4.20/drivers/ide/ide-disk.c~dev_read_only_hp       2003-04-09 15:14:54.000000000 -0600
++++ linux-2.4.20-braam/drivers/ide/ide-disk.c  2003-04-09 15:37:02.000000000 -0600
+@@ -558,6 +558,10 @@ static ide_startstop_t lba_48_rw_disk (i
   */
  static ide_startstop_t do_rw_disk (ide_drive_t *drive, struct request *rq, unsigned long block)
  {

diff --git a/lustre/kernel_patches/patches/exports.patch b/lustre/kernel_patches/patches/exports.patch
index 716c156..33e0b6c 100644 (file)
--- a/lustre/kernel_patches/patches/exports.patch
+++ b/lustre/kernel_patches/patches/exports.patch
@@ -7,20 +7,20 @@
  kernel/ksyms.c     |    5 +++++
  4 files changed, 9 insertions(+), 1 deletion(-)
 
---- linux-2.4.19-hp2_pnnl2/fs/ext3/Makefile~exports    Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/Makefile       Sun Jan 19 18:52:38 2003
+--- linux-2.4.18-18/fs/ext3/Makefile~exports   Sat Apr  5 02:51:27 2003
++++ linux-2.4.18-18-braam/fs/ext3/Makefile     Sat Apr  5 02:54:45 2003
 @@ -9,6 +9,8 @@
  
  O_TARGET := ext3.o
  
-+export-objs :=        super.o
++export-objs :=        super.o inode.o
 +
  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.19-hp2_pnnl2/fs/ext3/super.c~exports     Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/super.c        Sun Jan 19 18:52:38 2003
-@@ -1744,7 +1744,7 @@ static void __exit exit_ext3_fs(void)
+--- linux-2.4.18-18/fs/ext3/super.c~exports    Sat Apr  5 02:51:27 2003
++++ linux-2.4.18-18-braam/fs/ext3/super.c      Sat Apr  5 02:54:28 2003
+@@ -1746,7 +1746,7 @@ static void __exit exit_ext3_fs(void)
        unregister_filesystem(&ext3_fs_type);
  }
  
@@ -29,9 +29,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.19-hp2_pnnl2/include/linux/fs.h~exports  Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/include/linux/fs.h     Sun Jan 19 18:52:38 2003
-@@ -1020,6 +1020,7 @@ extern int unregister_filesystem(struct 
+--- linux-2.4.18-18/include/linux/fs.h~exports Sat Apr  5 02:51:27 2003
++++ linux-2.4.18-18-braam/include/linux/fs.h   Sat Apr  5 02:54:29 2003
+@@ -1046,6 +1046,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,11 +39,11 @@
  extern void umount_tree(struct vfsmount *);
  
  #define kern_umount mntput
---- linux-2.4.19-hp2_pnnl2/kernel/ksyms.c~exports      Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/kernel/ksyms.c Sun Jan 19 18:52:38 2003
-@@ -308,6 +308,11 @@ EXPORT_SYMBOL(dcache_dir_fsync);
- EXPORT_SYMBOL(dcache_readdir);
- EXPORT_SYMBOL(dcache_dir_ops);
+--- linux-2.4.18-18/kernel/ksyms.c~exports     Sat Apr  5 02:51:27 2003
++++ linux-2.4.18-18-braam/kernel/ksyms.c       Sat Apr  5 02:54:29 2003
+@@ -306,6 +306,11 @@ EXPORT_SYMBOL_GPL(buffermem_pages);
+ EXPORT_SYMBOL_GPL(nr_free_pages);
+ EXPORT_SYMBOL_GPL(page_cache_size);
  
 +/* lustre */
 +EXPORT_SYMBOL(panic_notifier_list);

diff --git a/lustre/kernel_patches/patches/exports_hp.patch b/lustre/kernel_patches/patches/exports_hp.patch
index 0222b46..bed8693 100644 (file)
--- a/lustre/kernel_patches/patches/exports_hp.patch
+++ b/lustre/kernel_patches/patches/exports_hp.patch
@@ -1,26 +1,26 @@
 
 
 
- fs/ext3/Makefile   |    2 ++
+ fs/ext3/Makefile   |    4 +++-
  fs/ext3/super.c    |    2 +-
  include/linux/fs.h |    1 +
- kernel/ksyms.c     |    4 ++++
- 4 files changed, 9 insertions(+), 1 deletion(-)
+ kernel/ksyms.c     |    5 +++++
+ 4 files changed, 10 insertions(+), 2 deletions(-)
 
---- linux-2.4.19-hp2_pnnl2/fs/ext3/Makefile~exports    Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/Makefile       Sun Jan 19 18:52:38 2003
+--- linux-2.4.20/fs/ext3/Makefile~exports_hp   Sat Apr  5 03:55:19 2003
++++ linux-2.4.20-braam/fs/ext3/Makefile        Sat Apr  5 03:56:03 2003
 @@ -9,6 +9,8 @@
  
  O_TARGET := ext3.o
  
-+export-objs :=        super.o
++export-objs :=        super.o inode.o
 +
  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.19-hp2_pnnl2/fs/ext3/super.c~exports     Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/super.c        Sun Jan 19 18:52:38 2003
-@@ -1744,7 +1744,7 @@ static void __exit exit_ext3_fs(void)
+--- linux-2.4.20/fs/ext3/super.c~exports_hp    Sat Apr  5 03:55:19 2003
++++ linux-2.4.20-braam/fs/ext3/super.c Sat Apr  5 03:55:19 2003
+@@ -1769,7 +1769,7 @@ static void __exit exit_ext3_fs(void)
        unregister_filesystem(&ext3_fs_type);
  }
  
@@ -29,24 +29,25 @@
  
  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.19-hp2_pnnl2/include/linux/fs.h~exports  Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/include/linux/fs.h     Sun Jan 19 18:52:38 2003
-@@ -1020,6 +1020,7 @@ extern int unregister_filesystem(struct 
+--- linux-2.4.20/include/linux/fs.h~exports_hp Sat Apr  5 03:55:19 2003
++++ linux-2.4.20-braam/include/linux/fs.h      Sat Apr  5 03:55:19 2003
+@@ -1005,6 +1005,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 *);
 +struct vfsmount *do_kern_mount(const char *type, int flags, char *name, void *data);
- extern void umount_tree(struct vfsmount *);
  
  #define kern_umount mntput
---- linux-2.4.19-hp2_pnnl2/kernel/ksyms.c~exports      Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/kernel/ksyms.c Sun Jan 19 18:52:38 2003
-@@ -308,6 +308,10 @@ EXPORT_SYMBOL(dcache_dir_fsync);
+ 
+--- linux-2.4.20/kernel/ksyms.c~exports_hp     Sat Apr  5 03:55:19 2003
++++ linux-2.4.20-braam/kernel/ksyms.c  Sat Apr  5 03:55:19 2003
+@@ -284,6 +284,11 @@ EXPORT_SYMBOL(dcache_dir_fsync);
  EXPORT_SYMBOL(dcache_readdir);
  EXPORT_SYMBOL(dcache_dir_ops);
  
 +/* lustre */
 +EXPORT_SYMBOL(pagecache_lock_cacheline);
++EXPORT_SYMBOL(panic_notifier_list);
 +EXPORT_SYMBOL(do_kern_mount);
 +
  /* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */

diff --git a/lustre/kernel_patches/patches/invalidate_show.patch b/lustre/kernel_patches/patches/invalidate_show.patch
index c3ae2f5..9273c5c 100644 (file)
--- a/lustre/kernel_patches/patches/invalidate_show.patch
+++ b/lustre/kernel_patches/patches/invalidate_show.patch
@@ -1,6 +1,15 @@
---- lum/fs/inode.c     Sat Oct 19 11:42:42 2002
-+++ linux-2.4.18-uml35-ext3online/fs/inode.c   Mon Oct 14 00:41:20 2002
-@@ -606,7 +553,8 @@ static void dispose_list(struct list_hea
+
+
+
+ fs/inode.c         |   21 ++++++++++++++-------
+ fs/smbfs/inode.c   |    2 +-
+ fs/super.c         |    4 ++--
+ include/linux/fs.h |    2 +-
+ 4 files changed, 18 insertions(+), 11 deletions(-)
+
+--- linux-rh-2.4.20-8/fs/inode.c~invalidate_show       2003-04-11 14:04:56.000000000 +0800
++++ linux-rh-2.4.20-8-root/fs/inode.c  2003-04-16 20:59:35.000000000 +0800
+@@ -604,7 +604,8 @@ static void dispose_list(struct list_hea
  /*
   * Invalidate all inodes for a device.
   */
@@ -10,7 +19,7 @@
  {
        struct list_head *next;
        int busy = 0, count = 0;
-@@ -631,6 +579,11 @@ static int invalidate_list(struct list_h
+@@ -629,6 +630,11 @@ static int invalidate_list(struct list_h
                        count++;
                        continue;
                }
@@ -22,7 +31,7 @@
                busy = 1;
        }
        /* only unused inodes may be cached with i_count zero */
-@@ -649,22 +601,23 @@ static int invalidate_list(struct list_h
+@@ -647,22 +653,23 @@ static int invalidate_list(struct list_h
  /**
   *    invalidate_inodes       - discard the inodes on a device
   *    @sb: superblock
@@ -51,7 +60,7 @@
        spin_unlock(&inode_lock);
  
        dispose_list(&throw_away);
-@@ -690,7 +643,7 @@ int invalidate_device(kdev_t dev, int do
+@@ -688,7 +695,7 @@ int invalidate_device(kdev_t dev, int do
                 * hold).
                 */
                shrink_dcache_sb(sb);
@@ -60,9 +69,9 @@
                drop_super(sb);
        }
        invalidate_buffers(dev);
---- lum/fs/super.c.orig        Sat Oct 19 11:42:42 2002
-+++ lum/fs/super.c     Wed Oct 30 17:16:55 2002
-@@ -936,7 +936,7 @@
+--- linux-rh-2.4.20-8/fs/super.c~invalidate_show       2003-04-11 14:04:57.000000000 +0800
++++ linux-rh-2.4.20-8-root/fs/super.c  2003-04-16 20:59:35.000000000 +0800
+@@ -943,7 +943,7 @@ void kill_super(struct super_block *sb)
        lock_super(sb);
        lock_kernel();
        sb->s_flags &= ~MS_ACTIVE;
@@ -71,7 +80,7 @@
        if (sop) {
                if (sop->write_super && sb->s_dirt)
                        sop->write_super(sb);
-@@ -945,7 +945,7 @@
+@@ -952,7 +952,7 @@ void kill_super(struct super_block *sb)
        }
  
        /* Forget any remaining inodes */
@@ -80,9 +89,9 @@
                printk(KERN_ERR "VFS: Busy inodes after unmount. "
                        "Self-destruct in 5 seconds.  Have a nice day...\n");
        }
---- lum/include/linux/fs.h     Wed Oct 30 17:10:42 2002
-+++ lum/include/linux/fs.h.orig        Tue Oct 22 23:15:00 2002
-@@ -1261,7 +1261,7 @@
+--- linux-rh-2.4.20-8/include/linux/fs.h~invalidate_show       2003-04-16 20:55:35.000000000 +0800
++++ linux-rh-2.4.20-8-root/include/linux/fs.h  2003-04-16 20:59:35.000000000 +0800
+@@ -1283,7 +1283,7 @@ static inline void mark_buffer_dirty_ino
  extern void set_buffer_flushtime(struct buffer_head *);
  extern void balance_dirty(void);
  extern int check_disk_change(kdev_t);
@@ -91,9 +100,9 @@
  extern int invalidate_device(kdev_t, int);
  extern void invalidate_inode_pages(struct inode *);
  extern void invalidate_inode_pages2(struct address_space *);
---- lum/fs/smbfs/inode.c.orig  Mon Feb 25 12:38:09 2002
-+++ lum/fs/smbfs/inode.c       Thu Feb  6 21:34:26 2003
-@@ -166,7 +166,7 @@
+--- linux-rh-2.4.20-8/fs/smbfs/inode.c~invalidate_show 2003-04-16 20:59:48.000000000 +0800
++++ linux-rh-2.4.20-8-root/fs/smbfs/inode.c    2003-04-16 21:00:43.000000000 +0800
+@@ -167,7 +167,7 @@ smb_invalidate_inodes(struct smb_sb_info
  {
        VERBOSE("\n");
        shrink_dcache_sb(SB_of(server));
@@ -102,3 +111,5 @@
  }
  
  /*
+
+_

diff --git a/lustre/kernel_patches/patches/iod-stock-24-exports_hp.patch b/lustre/kernel_patches/patches/iod-stock-24-exports_hp.patch
index 669b44d..3035f55 100644 (file)
--- a/lustre/kernel_patches/patches/iod-stock-24-exports_hp.patch
+++ b/lustre/kernel_patches/patches/iod-stock-24-exports_hp.patch
@@ -1,5 +1,10 @@
---- linux-2.4.19-hp2_pnnl4_Lv13/fs/inode.c.iod-export  2003-02-27 14:28:04.000000000 -0800
-+++ linux-2.4.19-hp2_pnnl4_Lv13/fs/inode.c     2003-03-03 13:54:59.000000000 -0800
+ fs/Makefile     |    2 +-
+ fs/inode.c      |    4 +++-
+ mm/page_alloc.c |    1 +
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+--- linux/fs/inode.c~iod-stock-24-exports_hp   Wed Apr  9 10:44:54 2003
++++ linux-mmonroe/fs/inode.c   Wed Apr  9 10:49:50 2003
 @@ -5,6 +5,7 @@
   */
  
@@ -8,7 +13,7 @@
  #include <linux/fs.h>
  #include <linux/string.h>
  #include <linux/mm.h>
-@@ -66,7 +67,8 @@
+@@ -66,7 +67,8 @@ static LIST_HEAD(anon_hash_chain); /* fo
   * NOTE! You also have to own the lock if you change
   * the i_state of an inode while it is in use..
   */
@@ -18,8 +23,8 @@
  
  /*
   * Statistics gathering..
---- linux-2.4.19-hp2_pnnl4_Lv13/fs/Makefile.iod-export 2003-02-27 14:28:01.000000000 -0800
-+++ linux-2.4.19-hp2_pnnl4_Lv13/fs/Makefile    2003-03-03 13:56:11.000000000 -0800
+--- linux/fs/Makefile~iod-stock-24-exports_hp  Wed Apr  9 10:26:08 2003
++++ linux-mmonroe/fs/Makefile  Wed Apr  9 10:49:50 2003
 @@ -7,7 +7,7 @@
  
  O_TARGET := fs.o
@@ -29,13 +34,15 @@
  mod-subdirs :=        nls xfs
  
  obj-y :=      open.o read_write.o devices.o file_table.o buffer.o \
---- linux-2.4.19-hp2_pnnl4_Lv13/mm/page_alloc.c.iod-export     2003-02-27 14:28:01.000000000 -0800
-+++ linux-2.4.19-hp2_pnnl4_Lv13/mm/page_alloc.c        2003-03-03 13:54:59.000000000 -0800
-@@ -28,6 +28,7 @@
+--- linux/mm/page_alloc.c~iod-stock-24-exports_hp      Wed Apr  9 10:26:14 2003
++++ linux-mmonroe/mm/page_alloc.c      Wed Apr  9 10:49:50 2003
+@@ -28,6 +28,7 @@ int nr_inactive_pages;
  LIST_HEAD(inactive_list);
  LIST_HEAD(active_list);
  pg_data_t *pgdat_list;
 +EXPORT_SYMBOL(pgdat_list);
  
- /* Used to look up the address of the struct zone encoded in page->zone */
- zone_t *zone_table[MAX_NR_ZONES*MAX_NR_NODES];
+ /*
+  *
+
+_

diff --git a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
index 03385a7..ee66c5a 100644 (file)
--- a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
+++ b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
@@ -4,9 +4,9 @@
  mm/slab.c            |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 61 insertions(+)
 
---- linux-2.4.19-hp2_pnnl2/arch/ia64/mm/init.c~kmem_cache_validate_hp  Sun Jan 19 18:59:23 2003
-+++ linux-2.4.19-hp2_pnnl2-root/arch/ia64/mm/init.c    Sun Jan 19 18:59:24 2003
-@@ -44,6 +44,12 @@ unsigned long vmalloc_end = VMALLOC_END_
+--- linux/arch/ia64/mm/init.c~kmem_cache_validate_hp   Wed Apr  9 11:09:46 2003
++++ linux-mmonroe/arch/ia64/mm/init.c  Wed Apr  9 11:12:23 2003
+@@ -45,6 +45,12 @@ unsigned long vmalloc_end = VMALLOC_END_
  static struct page *vmem_map;
  static unsigned long num_dma_physpages;
  
@@ -19,8 +19,8 @@
  int
  do_check_pgt_cache (int low, int high)
  {
---- linux-2.4.19-hp2_pnnl2/include/linux/slab.h~kmem_cache_validate_hp Sun Jan 19 18:59:23 2003
-+++ linux-2.4.19-hp2_pnnl2-root/include/linux/slab.h   Sun Jan 19 19:01:07 2003
+--- linux/include/linux/slab.h~kmem_cache_validate_hp  Wed Apr  9 11:08:48 2003
++++ linux-mmonroe/include/linux/slab.h Wed Apr  9 11:12:23 2003
 @@ -56,6 +56,7 @@ extern kmem_cache_t *kmem_cache_create(c
  extern int kmem_cache_destroy(kmem_cache_t *);
  extern int kmem_cache_shrink(kmem_cache_t *);
@@ -29,9 +29,9 @@
  extern void kmem_cache_free(kmem_cache_t *, void *);
  extern unsigned int kmem_cache_size(kmem_cache_t *);
  
---- linux-2.4.19-hp2_pnnl2/kernel/ksyms.c~kmem_cache_validate_hp       Sun Jan 19 18:59:23 2003
-+++ linux-2.4.19-hp2_pnnl2-root/kernel/ksyms.c Sun Jan 19 19:00:32 2003
-@@ -118,6 +118,7 @@ EXPORT_SYMBOL(kmem_find_general_cachep);
+--- linux/kernel/ksyms.c~kmem_cache_validate_hp        Wed Apr  9 11:12:20 2003
++++ linux-mmonroe/kernel/ksyms.c       Wed Apr  9 11:12:23 2003
+@@ -119,6 +119,7 @@ EXPORT_SYMBOL(kmem_find_general_cachep);
  EXPORT_SYMBOL(kmem_cache_create);
  EXPORT_SYMBOL(kmem_cache_destroy);
  EXPORT_SYMBOL(kmem_cache_shrink);
@@ -39,9 +39,9 @@
  EXPORT_SYMBOL(kmem_cache_alloc);
  EXPORT_SYMBOL(kmem_cache_free);
  EXPORT_SYMBOL(kmem_cache_size);
---- linux-2.4.19-hp2_pnnl2/mm/slab.c~kmem_cache_validate_hp    Sun Jan 19 18:59:23 2003
-+++ linux-2.4.19-hp2_pnnl2-root/mm/slab.c      Sun Jan 19 18:59:24 2003
-@@ -1207,6 +1207,59 @@ failed:
+--- linux/mm/slab.c~kmem_cache_validate_hp     Wed Apr  9 11:08:47 2003
++++ linux-mmonroe/mm/slab.c    Wed Apr  9 11:12:23 2003
+@@ -1205,6 +1205,59 @@ failed:
   * Called with the cache-lock held.
   */
  

diff --git a/lustre/kernel_patches/pc/invalidate_show.pc b/lustre/kernel_patches/pc/invalidate_show.pc
index 1f565ab..1d4ed77 100644 (file)
--- a/lustre/kernel_patches/pc/invalidate_show.pc
+++ b/lustre/kernel_patches/pc/invalidate_show.pc
@@ -1,5 +1,4 @@
 fs/inode.c
-fs/block_dev.c
-fs/devfs/base.c
 fs/super.c
 include/linux/fs.h
+fs/smbfs/inode.c

diff --git a/lustre/kernel_patches/pc/iod-rmap-exports.pc b/lustre/kernel_patches/pc/iod-rmap-exports.pc
index 1218f55..07288b0 100644 (file)
--- a/lustre/kernel_patches/pc/iod-rmap-exports.pc
+++ b/lustre/kernel_patches/pc/iod-rmap-exports.pc
@@ -1,6 +1,5 @@
 fs/inode.c
 fs/Makefile
-mm/filemap.c
 mm/vmscan.c
 mm/Makefile
 mm/page_alloc.c

diff --git a/lustre/kernel_patches/pc/kmem_cache_validate_hp.pc b/lustre/kernel_patches/pc/kmem_cache_validate_hp.pc
index a0a6297..42028bc 100644 (file)
--- a/lustre/kernel_patches/pc/kmem_cache_validate_hp.pc
+++ b/lustre/kernel_patches/pc/kmem_cache_validate_hp.pc
@@ -1,4 +1,3 @@
-arch/i386/mm/init.c
 arch/ia64/mm/init.c
 include/linux/slab.h
 kernel/ksyms.c

diff --git a/lustre/kernel_patches/pc/vanilla-2.4.19.pc b/lustre/kernel_patches/pc/vanilla-2.4.19.pc
deleted file mode 100644 (file)
index bb5c390..0000000
--- a/lustre/kernel_patches/pc/vanilla-2.4.19.pc
+++ /dev/null
@@ -1,19 +0,0 @@
-include/linux/lustre_version.h
-arch/ia64/mm/init.c
-arch/i386/mm/init.c
-drivers/block/blkpg.c
-drivers/block/loop.c
-drivers/ide/ide-disk.c
-fs/ext3/Makefile
-fs/ext3/super.c
-include/linux/blkdev.h
-include/linux/slab.h
-kernel/ksyms.c
-include/linux/dcache.h
-include/linux/fs.h
-fs/dcache.c
-fs/nfsd/vfs.c
-fs/namei.c
-fs/open.c
-fs/stat.c
-mm/slab.c

diff --git a/lustre/kernel_patches/pc/vfs_intent_hp.pc b/lustre/kernel_patches/pc/vfs_intent_hp.pc
deleted file mode 100644 (file)
index 881576c..0000000
--- a/lustre/kernel_patches/pc/vfs_intent_hp.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-fs/dcache.c
-fs/namei.c
-fs/nfsd/vfs.c
-fs/open.c
-fs/stat.c
-include/linux/dcache.h
-include/linux/fs.h
-kernel/ksyms.c

diff --git a/lustre/kernel_patches/series/chaos b/lustre/kernel_patches/series/chaos
index a558178..a5f3d25 100644 (file)
--- a/lustre/kernel_patches/series/chaos
+++ b/lustre/kernel_patches/series/chaos
@@ -6,3 +6,12 @@ vfs_intent-2.4.18-18.patch
 invalidate_show.patch
 iod-rmap-exports.patch
 export-truncate.patch
+htree-ext3-2.4.18.patch
+linux-2.4.18ea-0.8.26.patch
+ext3-2.4-ino_t.patch
+ext3-2.4.18-ino_sb_macro.patch
+extN-misc-fixup.patch
+extN-noread.patch
+extN-wantedi.patch
+extN-san.patch
+extN-2.4.18-ino_sb_fixup.patch

diff --git a/lustre/kernel_patches/series/rh-2.4.18-18 b/lustre/kernel_patches/series/rh-2.4.18-18
index 2c65af8..31838c6 100644 (file)
--- a/lustre/kernel_patches/series/rh-2.4.18-18
+++ b/lustre/kernel_patches/series/rh-2.4.18-18
@@ -7,5 +7,14 @@ uml_no_panic.patch
 vfs_intent-2.4.18-18.patch
 uml_compile_fixes.patch
 invalidate_show.patch
-iod-rmap-exports.patch
 export-truncate.patch
+iod-rmap-exports.patch
+htree-ext3-2.4.18.patch
+linux-2.4.18ea-0.8.26.patch
+ext3-2.4-ino_t.patch
+ext3-2.4.18-ino_sb_macro.patch
+extN-misc-fixup.patch
+extN-noread.patch
+extN-wantedi.patch
+extN-san.patch
+extN-2.4.18-ino_sb_fixup.patch

diff --git a/lustre/kernel_patches/series/vanilla-2.4.18 b/lustre/kernel_patches/series/vanilla-2.4.18
deleted file mode 100644 (file)
index 5d2ab68..0000000
--- a/lustre/kernel_patches/series/vanilla-2.4.18
+++ /dev/null
@@ -1,2 +0,0 @@
-vanilla-2.4.18
-invalidate_show.patch

diff --git a/lustre/kernel_patches/series/vanilla-2.4.19 b/lustre/kernel_patches/series/vanilla-2.4.19
deleted file mode 100644 (file)
index 37cb65e..0000000
--- a/lustre/kernel_patches/series/vanilla-2.4.19
+++ /dev/null
@@ -1,3 +0,0 @@
-vanilla-2.4.19.patch
-jbd-transno-cb.patch
-invalidate_show.patch