X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Freiserfs%2Fibalance.c;h=a362125da0d8b0f418010731ca2dc141e9a82f1b;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=5b9dee2ac2aec9e3d3d99a928cff364b001e67d5;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c index 5b9dee2ac..a362125da 100644 --- a/fs/reiserfs/ibalance.c +++ b/fs/reiserfs/ibalance.c @@ -133,7 +133,7 @@ static void internal_insert_childs (struct buffer_info * cur_bi, struct buffer_head * cur = cur_bi->bi_bh; struct block_head * blkh; int nr; - struct key * ih; + struct reiserfs_key * ih; struct disk_child new_dc[2]; struct disk_child * dc; int i; @@ -209,7 +209,7 @@ static void internal_delete_pointers_items ( struct buffer_head * cur = cur_bi->bi_bh; int nr; struct block_head * blkh; - struct key * key; + struct reiserfs_key * key; struct disk_child * dc; RFALSE( cur == NULL, "buffer is 0"); @@ -300,7 +300,7 @@ static void internal_copy_pointers_items ( int nr_dest, nr_src; int dest_order, src_order; struct block_head * blkh; - struct key * key; + struct reiserfs_key * key; struct disk_child * dc; nr_src = B_NR_ITEMS (src); @@ -409,7 +409,7 @@ static void internal_insert_key (struct buffer_info * dest_bi, struct buffer_head * dest = dest_bi->bi_bh; int nr; struct block_head * blkh; - struct key * key; + struct reiserfs_key * key; RFALSE( dest == NULL || src == NULL, "source(%p) or dest(%p) buffer is 0", src, dest); @@ -698,7 +698,7 @@ static void balance_internal_when_delete (struct tree_balance * tb, /* Replace delimiting key of buffers L[h] and S[h] by the given key.*/ -void replace_lkey ( +static void replace_lkey ( struct tree_balance * tb, int h, struct item_head * key @@ -718,7 +718,7 @@ void replace_lkey ( /* Replace delimiting key of buffers S[h] and R[h] by the given key.*/ -void replace_rkey ( +static void replace_rkey ( struct tree_balance * tb, int h, struct item_head * key