This gives a good first shot at fixing the patch management issues:

 - we followed the instructions that are being posted on the wiki
   and wich were discussed this morning

 - patches are now fairly easy to create and update

diff --git a/lustre/kernel_patches/patches/dev_read_only_hp.patch b/lustre/kernel_patches/patches/dev_read_only_hp.patch
index ea9fd58..0d3476c 100644 (file)
--- a/lustre/kernel_patches/patches/dev_read_only_hp.patch
+++ b/lustre/kernel_patches/patches/dev_read_only_hp.patch
@@ -3,8 +3,8 @@
  drivers/ide/ide-disk.c |    4 ++++
  3 files changed, 46 insertions(+)
 
---- linux-2.4.20-hp4_pnnl1/drivers/block/blkpg.c~dev_read_only_hp      Tue Apr  1 20:32:00 2003
-+++ linux-2.4.20-hp4_pnnl1-braam/drivers/block/blkpg.c Tue Apr  1 20:34:12 2003
+--- 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
  }
  
@@ -48,8 +48,8 @@
 +EXPORT_SYMBOL(dev_clear_rdonly);
 +
 +
---- linux-2.4.20-hp4_pnnl1/drivers/block/loop.c~dev_read_only_hp       Tue Apr  1 20:32:00 2003
-+++ linux-2.4.20-hp4_pnnl1-braam/drivers/block/loop.c  Tue Apr  1 20:32:00 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,8 +60,8 @@
                if (lo->lo_flags & LO_FLAGS_READ_ONLY)
                        goto err;
        } else if (rw == READA) {
---- linux-2.4.20-hp4_pnnl1/drivers/ide/ide-disk.c~dev_read_only_hp     Tue Apr  1 20:32:00 2003
-+++ linux-2.4.20-hp4_pnnl1-braam/drivers/ide/ide-disk.c        Tue Apr  1 20:32:00 2003
+--- 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/invalidate_show.patch b/lustre/kernel_patches/patches/invalidate_show.patch
index c3ae2f5..f4612fa 100644 (file)
--- a/lustre/kernel_patches/patches/invalidate_show.patch
+++ b/lustre/kernel_patches/patches/invalidate_show.patch
@@ -1,6 +1,14 @@
---- 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/super.c         |    4 ++--
+ include/linux/fs.h |    2 +-
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+--- linux-2.4.20/fs/inode.c~invalidate_show    2003-04-08 23:34:36.000000000 -0600
++++ linux-2.4.20-braam/fs/inode.c      2003-04-08 23:34:36.000000000 -0600
+@@ -553,7 +553,8 @@ static void dispose_list(struct list_hea
  /*
   * Invalidate all inodes for a device.
   */
@@ -10,7 +18,7 @@
  {
        struct list_head *next;
        int busy = 0, count = 0;
-@@ -631,6 +579,11 @@ static int invalidate_list(struct list_h
+@@ -578,6 +579,11 @@ static int invalidate_list(struct list_h
                        count++;
                        continue;
                }
@@ -22,7 +30,7 @@
                busy = 1;
        }
        /* only unused inodes may be cached with i_count zero */
-@@ -649,22 +601,23 @@ static int invalidate_list(struct list_h
+@@ -596,22 +602,23 @@ static int invalidate_list(struct list_h
  /**
   *    invalidate_inodes       - discard the inodes on a device
   *    @sb: superblock
@@ -51,7 +59,7 @@
        spin_unlock(&inode_lock);
  
        dispose_list(&throw_away);
-@@ -690,7 +643,7 @@ int invalidate_device(kdev_t dev, int do
+@@ -637,7 +644,7 @@ int invalidate_device(kdev_t dev, int do
                 * hold).
                 */
                shrink_dcache_sb(sb);
@@ -60,9 +68,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-2.4.20/fs/super.c~invalidate_show    2003-04-08 23:34:36.000000000 -0600
++++ linux-2.4.20-braam/fs/super.c      2003-04-08 23:34:36.000000000 -0600
+@@ -835,7 +835,7 @@ void kill_super(struct super_block *sb)
        lock_super(sb);
        lock_kernel();
        sb->s_flags &= ~MS_ACTIVE;
@@ -71,7 +79,7 @@
        if (sop) {
                if (sop->write_super && sb->s_dirt)
                        sop->write_super(sb);
-@@ -945,7 +945,7 @@
+@@ -844,7 +844,7 @@ void kill_super(struct super_block *sb)
        }
  
        /* Forget any remaining inodes */
@@ -80,9 +88,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-2.4.20/include/linux/fs.h~invalidate_show    2003-04-08 23:34:36.000000000 -0600
++++ linux-2.4.20-braam/include/linux/fs.h      2003-04-08 23:34:36.000000000 -0600
+@@ -1237,7 +1237,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,14 +99,5 @@
  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 @@
- {
-       VERBOSE("\n");
-       shrink_dcache_sb(SB_of(server));
--      invalidate_inodes(SB_of(server));
-+      invalidate_inodes(SB_of(server), 0);
- }
- 
- /*
+
+_

diff --git a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
index 03385a7..ae5906d 100644 (file)
--- a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
+++ b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch
@@ -4,11 +4,11 @@
  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_
- static struct page *vmem_map;
+--- linux-2.4.20/arch/ia64/mm/init.c~kmem_cache_validate_hp    2003-04-08 23:34:12.000000000 -0600
++++ linux-2.4.20-braam/arch/ia64/mm/init.c     2003-04-08 23:34:12.000000000 -0600
+@@ -45,6 +45,12 @@ static struct page *vmem_map;
  static unsigned long num_dma_physpages;
+ #endif
  
 +struct page *check_get_page(unsigned long kaddr)
 +{
@@ -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-2.4.20/include/linux/slab.h~kmem_cache_validate_hp   2003-04-08 23:34:12.000000000 -0600
++++ linux-2.4.20-braam/include/linux/slab.h    2003-04-08 23:34:12.000000000 -0600
 @@ -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-2.4.20/kernel/ksyms.c~kmem_cache_validate_hp 2003-04-08 23:34:12.000000000 -0600
++++ linux-2.4.20-braam/kernel/ksyms.c  2003-04-08 23:34:12.000000000 -0600
+@@ -103,6 +103,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-2.4.20/mm/slab.c~kmem_cache_validate_hp      2003-04-08 23:34:12.000000000 -0600
++++ linux-2.4.20-braam/mm/slab.c       2003-04-08 23:34:12.000000000 -0600
+@@ -1205,6 +1205,59 @@ failed:
   * Called with the cache-lock held.
   */
  

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/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