X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=second%2Ffs_reiserfs.c;h=588a0efcfb050493da22e4c643ab86877a863c60;hb=b5f28817d6d68c2cb2a3e5eaefe4633b085557b6;hp=238f523e843c848246522e064be08a402c4b6794;hpb=082b8310e3f92ea8da0b7011549bd86c9fd4ce95;p=yaboot.git

diff --git a/second/fs_reiserfs.c b/second/fs_reiserfs.c
index 238f523..588a0ef 100644
--- a/second/fs_reiserfs.c
+++ b/second/fs_reiserfs.c
@@ -33,8 +33,8 @@
 #include "reiserfs/reiserfs.h"
 
 /* Exported in struct fs_t */
-static int reiserfs_open( struct boot_file_t *file, const char *dev_name,
-			  struct partition_t *part, const char *file_name );
+static int reiserfs_open( struct boot_file_t *file, struct partition_t *part,
+			  struct boot_fspec_t *fspec);
 static int reiserfs_read( struct boot_file_t *file, unsigned int size,
 
 			  void *buffer );
@@ -63,10 +63,12 @@ int errnum;
 
 
 static int
-reiserfs_open( struct boot_file_t *file, const char *dev_name,
-               struct partition_t *part, const char *file_name )
+reiserfs_open( struct boot_file_t *file, struct partition_t *part,
+		struct boot_fspec_t *fspec)
 {
      static char buffer[1024];
+     char *dev_name = fspec->dev;
+     char *file_name = fspec->file;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
@@ -74,7 +76,7 @@ reiserfs_open( struct boot_file_t *file, const char *dev_name,
      memset( INFO, 0, sizeof(struct reiserfs_state) );
      INFO->file = file;
 
-     if (part)
+     if (fspec->part)
      {
 	  DEBUG_F( "Determining offset for partition %d\n", part->part_number );
 	  INFO->partition_offset = ((uint64_t)part->part_start) * part->blocksize;
@@ -211,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 )
 	  {