static __inline__ __u32
-log2( __u32 word )
+reiserfs_log2( __u32 word )
{
int i = 0;
while( word && (word & (1 << ++i)) == 0 );
while ( transactions-- > 0 )
{
int i = 0;
- int j_len;
+ int j_len = 0;
if ( *journal_table != 0xffffffff )
{
/* Search for the blockNr in cached journal */
- j_len = le32_to_cpu(*journal_table++);
+ j_len = le32_to_cpu((*journal_table)++);
while ( i++ < j_len )
{
if ( le32_to_cpu(*journal_table++) == blockNr )
INFO->version = le16_to_cpu(super.s_version);
INFO->blocksize = le16_to_cpu(super.s_blocksize);
- INFO->blocksize_shift = log2( INFO->blocksize );
+ INFO->blocksize_shift = reiserfs_log2( INFO->blocksize );
INFO->journal_block = le32_to_cpu(super.s_journal_block);
INFO->journal_block_count = le32_to_cpu(super.s_orig_journal_size);
cache = CACHE( depth );
else
{
- cache = read_tree_node( INFO->blocks[depth], --depth );
+ /* Save depth as using it twice as args to read_tree_node()
+ * has undefined behaviour */
+ __u16 d = depth;
+ cache = read_tree_node( INFO->blocks[d], --depth );
if ( !cache )
return 0;
}