Use explicit casts when dumping config data

[yaboot.git] / second / fs_reiserfs.c

diff --git a/second/fs_reiserfs.c b/second/fs_reiserfs.c
index 4b83a7aa1c26070f072574258a26626f520053d6..b0c3ac00ee6743c3c6a21c8173462921446be0c9 100644 (file)
--- a/second/fs_reiserfs.c
+++ b/second/fs_reiserfs.c
@@ -156,7 +156,7 @@ reiserfs_close( struct boot_file_t *file )
 
 
 static __inline__ __u32
-log2( __u32 word )
+reiserfs_log2( __u32 word )
 {
      int i = 0;
      while( word && (word & (1 << ++i)) == 0 );
@@ -213,7 +213,7 @@ block_read( __u32 blockNr, __u32 start, __u32 len, char *buffer )
      while ( transactions-- > 0 )
      {
          int i = 0;
-         int j_len;
+         int j_len = 0;
 
          if ( *journal_table != 0xffffffff )
          {
@@ -428,7 +428,7 @@ reiserfs_read_super( void )
 
      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);