Include the EXT3_MOUNT_ASYNCDEL addition from ext3-delete-thread into the

context of the iopen patch (as it is in the 2.4.20 version), otherwise the
iopen patch fails to apply.

diff --git a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18.patch b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18.patch
index 1cc3ad4..2779b94 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18.patch
+++ b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18.patch
@@ -268,7 +268,7 @@
  #define EXT3_MOUNT_UPDATE_JOURNAL     0x1000  /* Update the journal format */
  #define EXT3_MOUNT_NO_UID32           0x2000  /* Disable 32-bit UIDs */
  #define EXT3_MOUNT_INDEX              0x4000  /* Enable directory index */
-+#define EXT3_MOUNT_ASYNCDEL          0x20000  /* Delayed deletion */
++#define EXT3_MOUNT_ASYNCDEL           0x20000 /* Delayed deletion */
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
  #ifndef _LINUX_EXT2_FS_H

diff --git a/lustre/kernel_patches/patches/iopen-2.4.19.patch b/lustre/kernel_patches/patches/iopen-2.4.19.patch
index 580d38b..9e3e94e 100644 (file)
--- a/lustre/kernel_patches/patches/iopen-2.4.19.patch
+++ b/lustre/kernel_patches/patches/iopen-2.4.19.patch
@@ -393,15 +393,14 @@
                        /* Eventually we will want to be able to create
 --- linux-2.4.19-hp3_pnnl1/include/linux/ext3_fs.h~iopen-2.4.19        2003-05-19 14:36:47.000000000 +0800
 +++ linux-2.4.19-hp3_pnnl1-root/include/linux/ext3_fs.h        2003-05-19 14:51:26.000000000 +0800
-@@ -322,6 +322,9 @@ struct ext3_inode {
+@@ -321,6 +321,9 @@ struct ext3_inode {
+ #define EXT3_MOUNT_UPDATE_JOURNAL     0x1000  /* Update the journal format */
  #define EXT3_MOUNT_NO_UID32           0x2000  /* Disable 32-bit UIDs */
  #define EXT3_MOUNT_XATTR_USER         0x4000  /* Extended user attributes */
++#define EXT3_MOUNT_IOPEN              0x8000  /* Allow access via iopen */
++#define EXT3_MOUNT_IOPEN_NOPRIV               0x10000 /* Make iopen world-readable */
+ #define EXT3_MOUNT_ASYNCDEL           0x20000 /* Delayed deletion */
  
-+#define EXT3_MOUNT_IOPEN                0x8000  /* Allow access via iopen */
-+#define EXT3_MOUNT_IOPEN_NOPRIV        0x10000  /* Make iopen world-readable */
-+
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
- #define clear_opt(o, opt)             o &= ~EXT3_MOUNT_##opt
 
 _