- few patches from chaos-2.4.18-pdirops series are updated due to ext3-htree.patch

diff --git a/lustre/kernel_patches/patches/ext3-compat-2.4.18-chaos.patch b/lustre/kernel_patches/patches/ext3-compat-2.4.18-chaos.patch
index dab4f42..68a2244 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-compat-2.4.18-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-compat-2.4.18-chaos.patch
@@ -1,10 +1,18 @@
- fs/ext3/namei.c |    2 +-
+ fs/ext3/namei.c |    3 ++-
  lib/rbtree.c    |    6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 2 files changed, 5 insertions(+), 4 deletions(-)
 
---- linux-2.4.18-chaos/fs/ext3/namei.c~ext3-compat-2.4.18-chaos        2003-07-28 17:52:04.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/fs/ext3/namei.c  2003-09-16 16:43:17.000000000 +0400
-@@ -830,9 +830,9 @@ static int ext3_rmdir (struct inode * di
+--- linux-2.4.18-chaos-pdirops/fs/ext3/namei.c~ext3-compat-2.4.18-chaos        2003-09-23 13:13:10.000000000 +0400
++++ linux-2.4.18-chaos-pdirops-alexey/fs/ext3/namei.c  2003-09-23 13:13:28.000000000 +0400
+@@ -28,6 +28,7 @@
+ #include <linux/string.h>
+ #include <linux/locks.h>
+ #include <linux/quotaops.h>
++#include <linux/slab.h>
+ 
+ 
+ /*
+@@ -830,9 +831,9 @@ static int ext3_rmdir (struct inode * di
         * recovery. */
        inode->i_size = 0;
        ext3_orphan_add(handle, inode);
@@ -15,8 +23,8 @@
        dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
        ext3_mark_inode_dirty(handle, dir);
  
---- linux-2.4.18-chaos/lib/rbtree.c~ext3-compat-2.4.18-chaos   2003-07-28 17:52:20.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/lib/rbtree.c     2003-09-16 16:56:42.000000000 +0400
+--- linux-2.4.18-chaos-pdirops/lib/rbtree.c~ext3-compat-2.4.18-chaos   2003-07-28 17:52:20.000000000 +0400
++++ linux-2.4.18-chaos-pdirops-alexey/lib/rbtree.c     2003-09-23 13:13:15.000000000 +0400
 @@ -219,6 +219,8 @@ static void __rb_erase_color(rb_node_t *
                node->rb_color = RB_BLACK;
  }

diff --git a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18-2.patch b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18-2.patch
index bb30b50..1e2295c 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18-2.patch
+++ b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.18-2.patch
@@ -427,9 +427,9 @@
  /*
   * ioctl commands
 @@ -322,6 +323,7 @@ struct ext3_inode {
+   #define EXT3_MOUNT_WRITEBACK_DATA   0x0C00  /* No data ordering */
  #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 */
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */

diff --git a/lustre/kernel_patches/patches/iopen-2.4.18-2.patch b/lustre/kernel_patches/patches/iopen-2.4.18-2.patch
index 3d9a864..c971a83 100644 (file)
--- a/lustre/kernel_patches/patches/iopen-2.4.18-2.patch
+++ b/lustre/kernel_patches/patches/iopen-2.4.18-2.patch
@@ -345,9 +345,9 @@
 --- linux-2.4.18-p4smp/fs/ext3/namei.c~iopen-2.4.18    2003-07-09 13:32:38.000000000 -0600
 +++ linux-2.4.18-p4smp-braam/fs/ext3/namei.c   2003-07-09 17:13:02.000000000 -0600
 @@ -34,6 +34,7 @@
- #include <linux/string.h>
  #include <linux/locks.h>
  #include <linux/quotaops.h>
+ #include <linux/slab.h>
 +#include "iopen.h"
  
  /*
@@ -410,9 +410,9 @@
 --- linux-2.4.18-p4smp/include/linux/ext3_fs.h~iopen-2.4.18    2003-07-09 13:32:38.000000000 -0600
 +++ linux-2.4.18-p4smp-braam/include/linux/ext3_fs.h   2003-07-09 17:13:02.000000000 -0600
 @@ -321,6 +321,8 @@ struct ext3_inode {
+   #define EXT3_MOUNT_WRITEBACK_DATA   0x0C00  /* No data ordering */
  #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_IOPEN              0x8000  /* Allow access via iopen */
 +#define EXT3_MOUNT_IOPEN_NOPRIV               0x10000 /* Make iopen world-readable */
  #define EXT3_MOUNT_ASYNCDEL           0x20000 /* Delayed deletion */