lustre/kernel_patches/patches/ext3-compat-2.4.18-chaos.patch

   1  fs/ext3/namei.c |    3 ++-
   2  lib/rbtree.c    |    6 +++---
   3  2 files changed, 5 insertions(+), 4 deletions(-)
   4
   5 --- linux-2.4.18-chaos-pdirops/fs/ext3/namei.c~ext3-compat-2.4.18-chaos 2003-09-23 13:13:10.000000000 +0400
   6 +++ linux-2.4.18-chaos-pdirops-alexey/fs/ext3/namei.c   2003-09-23 13:13:28.000000000 +0400
   7 @@ -28,6 +28,7 @@
   8  #include <linux/string.h>
   9  #include <linux/locks.h>
  10  #include <linux/quotaops.h>
  11 +#include <linux/slab.h>
  12
  13
  14  /*
  15 @@ -830,9 +831,9 @@ static int ext3_rmdir (struct inode * di
  16          * recovery. */
  17         inode->i_size = 0;
  18         ext3_orphan_add(handle, inode);
  19 -       ext3_mark_inode_dirty(handle, inode);
  20         dir->i_nlink--;
  21         inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
  22 +       ext3_mark_inode_dirty(handle, inode);
  23         dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
  24         ext3_mark_inode_dirty(handle, dir);
  25
  26 --- linux-2.4.18-chaos-pdirops/lib/rbtree.c~ext3-compat-2.4.18-chaos    2003-07-28 17:52:20.000000000 +0400
  27 +++ linux-2.4.18-chaos-pdirops-alexey/lib/rbtree.c      2003-09-23 13:13:15.000000000 +0400
  28 @@ -219,6 +219,8 @@ static void __rb_erase_color(rb_node_t *
  29                 node->rb_color = RB_BLACK;
  30  }
  31
  32 +EXPORT_SYMBOL_GPL(rb_insert_color);
  33 +
  34  void rb_erase(rb_node_t * node, rb_root_t * root)
  35  {
  36         rb_node_t * child, * parent;
  37 @@ -292,6 +294,4 @@ void rb_erase(rb_node_t * node, rb_root_
  38         if (color == RB_BLACK)
  39                 __rb_erase_color(child, parent, root);
  40  }
  41 -
  42 -EXPORT_SYMBOL_GPL(rb_insert_color);
  43 -EXPORT_SYMBOL_GPL(rb_erase);
  44 +EXPORT_SYMBOL(rb_erase);
  45
  46 _