patch-2.4.14 linux/fs/reiserfs/lbalance.c

• Lines: 38
• Date: Tue Oct 30 15:11:34 2001
• Orig file: v2.4.13/linux/fs/reiserfs/lbalance.c
• Orig date: Tue Oct 23 22:48:53 2001

diff -u --recursive --new-file v2.4.13/linux/fs/reiserfs/lbalance.c linux/fs/reiserfs/lbalance.c
@@ -216,7 +216,7 @@
     /* merge to right only part of item */
     RFALSE( ih_item_len(ih) <= bytes_or_entries,
             "vs-10060: no so much bytes %lu (needed %lu)",
-            ih_item_len(ih), bytes_or_entries);
+            ( unsigned long )ih_item_len(ih), ( unsigned long )bytes_or_entries);
     
     /* change first item key of the DEST */
     if ( is_direct_le_ih (dih) ) {
@@ -325,7 +325,8 @@
 	t_dc = B_N_CHILD (dest_bi->bi_parent, dest_bi->bi_position);
 	RFALSE( dc_block_number(t_dc) != dest->b_blocknr,
 	        "vs-10160: block number in bh does not match to field in disk_child structure %lu and %lu",
-                dest->b_blocknr, dc_block_number(t_dc));
+                ( long unsigned ) dest->b_blocknr, 
+		( long unsigned ) dc_block_number(t_dc));
 	put_dc_size( t_dc, dc_size(t_dc) + (j - last_inserted_loc + IH_SIZE * cpy_num ) );
     
 	do_balance_mark_internal_dirty (dest_bi->tb, dest_bi->bi_parent, 0);
@@ -359,7 +360,7 @@
 	    if (is_indirect_le_ih (ih)) {
 		RFALSE( cpy_bytes == ih_item_len(ih) && get_ih_free_space(ih),
 		        "vs-10180: when whole indirect item is bottle to left neighbor, it must have free_space==0 (not %lu)",
-                        get_ih_free_space (ih));
+                        ( long unsigned ) get_ih_free_space (ih));
 		set_ih_free_space (&n_ih, 0);
 	    }
 
@@ -989,7 +990,8 @@
         RFALSE( is_statdata_le_ih (ih), "10195: item is stat data");
         RFALSE( pos_in_item && pos_in_item + cut_size != ih_item_len(ih),
                 "10200: invalid offset (%lu) or trunc_size (%lu) or ih_item_len (%lu)",
-                pos_in_item, cut_size, ih_item_len (ih));
+                ( long unsigned ) pos_in_item, ( long unsigned ) cut_size, 
+		( long unsigned ) ih_item_len (ih));
 
         /* shift item body to left if cut is from the head of item */
         if (pos_in_item == 0) {