vserver 1.9.5.x5

[linux-2.6.git] / fs / reiserfs / fix_node.c

diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c
index 649e32a..e4f64be 100644 (file)
--- a/fs/reiserfs/fix_node.c
+++ b/fs/reiserfs/fix_node.c
@@ -163,7 +163,7 @@ static void create_virtual_node (struct tree_balance * tb, int h)
   
     /* set right merge flag we take right delimiting key and check whether it is a mergeable item */
     if (tb->CFR[0]) {
-       struct key * key;
+       struct reiserfs_key * key;
 
        key = B_N_PDELIM_KEY (tb->CFR[0], tb->rkey[0]);
        if (op_is_left_mergeable (key, Sh->b_size) && (vn->vn_mode != M_DELETE ||
@@ -510,9 +510,10 @@ static int get_num_ver (int mode, struct tree_balance * tb, int h,
        // s2bytes
        snum012[4] = op_unit_num (&vn->vn_vi[split_item_num]) - snum012[4] - bytes_to_r - bytes_to_l - bytes_to_S1new;
 
-       if (vn->vn_vi[split_item_num].vi_index != TYPE_DIRENTRY)
+       if (vn->vn_vi[split_item_num].vi_index != TYPE_DIRENTRY &&
+           vn->vn_vi[split_item_num].vi_index != TYPE_INDIRECT)
            reiserfs_warning (tb->tb_sb, "vs-8115: get_num_ver: not "
-                             "directory item");
+                             "directory or indirect item");
     }
 
     /* now we know S2bytes, calculate S1bytes */
@@ -724,7 +725,7 @@ else \
 }
 
 
-void free_buffers_in_tb (
+static void free_buffers_in_tb (
                       struct tree_balance * p_s_tb
                       ) {
   int n_counter;
@@ -820,7 +821,7 @@ static int  get_empty_nodes(
     RFALSE (p_s_tb->FEB[p_s_tb->cur_blknum],
            "PAP-8141: busy slot for new buffer");
 
-    mark_buffer_journal_new(p_s_new_bh) ;
+    set_buffer_journal_new (p_s_new_bh);
     p_s_tb->FEB[p_s_tb->cur_blknum++] = p_s_new_bh;
   }
 
@@ -1140,7 +1141,7 @@ static inline int can_node_be_removed (int mode, int lfree, int sfree, int rfree
     struct buffer_head * Sh = PATH_H_PBUFFER (tb->tb_path, h);
     int levbytes = tb->insert_size[h];
     struct item_head * ih;
-    struct key * r_key = NULL;
+    struct reiserfs_key * r_key = NULL;
 
     ih = B_N_PITEM_HEAD (Sh, 0);
     if ( tb->CFR[h] )