- merge 2 weeks of b1_4 fixes onto HEAD

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-delete_thread-2.4.20-hp.patch

diff --git a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch
index f91b8ff..d722b68 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch
+++ b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch
@@ -5,10 +5,10 @@
  include/linux/ext3_fs_sb.h |   10 +
  5 files changed, 365 insertions(+)
 
-Index: linux-2.4.20-hp4-pnnl13/fs/ext3/super.c
+Index: linux/fs/ext3/super.c
 ===================================================================
---- linux-2.4.20-hp4-pnnl13.orig/fs/ext3/super.c       2004-01-12 19:22:32.000000000 +0300
-+++ linux-2.4.20-hp4-pnnl13/fs/ext3/super.c    2004-01-13 17:04:38.000000000 +0300
+--- linux.orig/fs/ext3/super.c Mon Feb  2 20:57:35 2004
++++ linux/fs/ext3/super.c      Mon Feb  2 20:58:05 2004
 @@ -400,6 +400,221 @@
        }
  }
@@ -298,10 +298,10 @@ Index: linux-2.4.20-hp4-pnnl13/fs/ext3/super.c
        if (sbi->s_mount_opt & EXT3_MOUNT_ABORT)
                ext3_abort(sb, __FUNCTION__, "Abort forced by user");
  
-Index: linux-2.4.20-hp4-pnnl13/fs/ext3/inode.c
+Index: linux/fs/ext3/inode.c
 ===================================================================
---- linux-2.4.20-hp4-pnnl13.orig/fs/ext3/inode.c       2004-01-12 19:22:32.000000000 +0300
-+++ linux-2.4.20-hp4-pnnl13/fs/ext3/inode.c    2004-01-13 17:01:40.000000000 +0300
+--- linux.orig/fs/ext3/inode.c Mon Feb  2 20:57:35 2004
++++ linux/fs/ext3/inode.c      Mon Feb  2 20:58:05 2004
 @@ -2500,6 +2500,118 @@
        return err;
  }
@@ -421,10 +421,10 @@ Index: linux-2.4.20-hp4-pnnl13/fs/ext3/inode.c
  /* 
   * On success, We end up with an outstanding reference count against
   * iloc->bh.  This _must_ be cleaned up later. 
-Index: linux-2.4.20-hp4-pnnl13/fs/ext3/file.c
+Index: linux/fs/ext3/file.c
 ===================================================================
---- linux-2.4.20-hp4-pnnl13.orig/fs/ext3/file.c        2004-01-12 19:22:32.000000000 +0300
-+++ linux-2.4.20-hp4-pnnl13/fs/ext3/file.c     2004-01-13 17:01:40.000000000 +0300
+--- linux.orig/fs/ext3/file.c  Mon Feb  2 20:57:34 2004
++++ linux/fs/ext3/file.c       Mon Feb  2 20:58:05 2004
 @@ -125,7 +125,11 @@
  };
  
@@ -437,23 +437,10 @@ Index: linux-2.4.20-hp4-pnnl13/fs/ext3/file.c
        setattr:        ext3_setattr,           /* BKL held */
        setxattr:       ext3_setxattr,          /* BKL held */
        getxattr:       ext3_getxattr,          /* BKL held */
-Index: linux-2.4.20-hp4-pnnl13/fs/buffer.c
+Index: linux/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.4.20-hp4-pnnl13.orig/fs/buffer.c   2003-09-13 15:19:26.000000000 +0400
-+++ linux-2.4.20-hp4-pnnl13/fs/buffer.c        2004-01-13 17:01:40.000000000 +0300
-@@ -376,6 +376,8 @@
-       if (sb->s_op && sb->s_op->sync_fs)
-               sb->s_op->sync_fs(sb);
-       unlock_super(sb);
-+      if (sb->s_op && sb->s_op->sync_fs)
-+              sb->s_op->sync_fs(sb);
-       unlock_kernel();
- 
-       return sync_buffers(dev, 1);
-Index: linux-2.4.20-hp4-pnnl13/include/linux/ext3_fs.h
-===================================================================
---- linux-2.4.20-hp4-pnnl13.orig/include/linux/ext3_fs.h       2004-01-12 19:22:32.000000000 +0300
-+++ linux-2.4.20-hp4-pnnl13/include/linux/ext3_fs.h    2004-01-13 17:01:40.000000000 +0300
+--- linux.orig/include/linux/ext3_fs.h Mon Feb  2 20:57:35 2004
++++ linux/include/linux/ext3_fs.h      Mon Feb  2 20:58:05 2004
 @@ -193,6 +193,7 @@
   */
  #define EXT3_STATE_JDATA              0x00000001 /* journaled data exists */
@@ -480,10 +467,10 @@ Index: linux-2.4.20-hp4-pnnl13/include/linux/ext3_fs.h
  
  /* ioctl.c */
  extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
-Index: linux-2.4.20-hp4-pnnl13/include/linux/ext3_fs_sb.h
+Index: linux/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.4.20-hp4-pnnl13.orig/include/linux/ext3_fs_sb.h    2004-01-12 19:22:32.000000000 +0300
-+++ linux-2.4.20-hp4-pnnl13/include/linux/ext3_fs_sb.h 2004-01-13 17:01:40.000000000 +0300
+--- linux.orig/include/linux/ext3_fs_sb.h      Mon Feb  2 20:57:35 2004
++++ linux/include/linux/ext3_fs_sb.h   Mon Feb  2 20:58:05 2004
 @@ -29,6 +29,8 @@
  
  #define EXT3_MAX_GROUP_LOADED 8