X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_ext2.c;h=41a3c79cce2096ac513e9135ccb677b072a67f4f;hp=c86907ebb89464681194da73c951bc56ad0981eb;hb=94b9f91a346ceed386faf284ad2e549922a1a385;hpb=f9631a4c18c659a6144a697e0c629fe63a44970f

diff --git a/second/fs_ext2.c b/second/fs_ext2.c
index c86907e..41a3c79 100644
--- a/second/fs_ext2.c
+++ b/second/fs_ext2.c
@@ -54,7 +54,7 @@ static int ext2_read(	struct boot_file_t*	file,
 static int ext2_seek(	struct boot_file_t*	file,
 			unsigned int		newpos);
 static int ext2_close(	struct boot_file_t*	file);
-static unsigned int ext2_ino_size(struct boot_file_t *file);
+static int ext2_ino_size(struct boot_file_t *file, unsigned int *size);
 
 struct fs_t ext2_filesystem =
 {
@@ -109,7 +109,7 @@ static unsigned long read_total;
 static unsigned long read_max;
 static struct boot_file_t* read_cur_file;
 static errcode_t read_result;
-static char* read_buffer;
+static unsigned char* read_buffer;
 
 static int read_dump_range(void);
 static int read_iterator(ext2_filsys fs, blk_t *blocknr, int lg_block, void *private);
@@ -141,7 +141,8 @@ ext2_open(	struct boot_file_t*	file,
 	  DEBUG_LEAVE(FILE_ERR_FSBUSY);
 	  return FILE_ERR_FSBUSY;
      }
-     if (file->device_kind != FILE_DEVICE_BLOCK) {
+     if (file->device_kind != FILE_DEVICE_BLOCK
+         && file->device_kind != FILE_DEVICE_ISCSI) {
 	  DEBUG_LEAVE(FILE_ERR_BADDEV);
 	  return FILE_ERR_BADDEV;
      }
@@ -566,14 +567,15 @@ ext2_close(	struct boot_file_t*	file)
      return 0;
 }
 
-static unsigned int ext2_ino_size(struct boot_file_t *file)
+static int ext2_ino_size(struct boot_file_t *file, unsigned int *size)
 {
     struct ext2_inode ei;
 
     if (ext2fs_read_inode(fs, file->inode, &ei))
-	return 0;
+	return FILE_IOERR;
 
-    return ei.i_size;
+    *size = ei.i_size;
+    return FILE_ERR_OK;
 }
 
 static errcode_t linux_open (const char *name, int flags, io_channel * channel)