From: Ethan Benson <erbenson@alaska.net>
Date: Sun, 8 Sep 2002 00:13:58 +0000 (+0000)
Subject: Fix partition file search
X-Git-Tag: yaboot-1.3.13~47
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=d0e5fbe697b5cf916bf70c1bae736c82cbbc876b;ds=sidebyside

Fix partition file search

* Change file_block_open() to check for FILE_OK rather then NULL
return from fs_open().  When no partition is specified in a file open
call yaboot will loop through all known partitions until the file is
found, or no more partitions are left.  In older versions fs_open()
would check for FILE_OK, so checking for NULL return from fs_open()
worked, in current versions fs_open() checks for BADFS so proper
errors can be reported.  This only really affects IBM CHRP.

git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-28
---

diff --git a/ChangeLog b/ChangeLog
index aabb375..54c2c6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,26 @@
 # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2002-09-08 00:13:58 GMT	Ethan Benson <erbenson@alaska.net>	patch-28
+
+    Summary:
+      Fix partition file search
+    Revision:
+      yaboot--devel--1.3--patch-28
+
+    * Change file_block_open() to check for FILE_OK rather then NULL
+    return from fs_open().  When no partition is specified in a file open
+    call yaboot will loop through all known partitions until the file is
+    found, or no more partitions are left.  In older versions fs_open()
+    would check for FILE_OK, so checking for NULL return from fs_open()
+    worked, in current versions fs_open() checks for BADFS so proper
+    errors can be reported.  This only really affects IBM CHRP.
+    
+
+    modified files:
+     ChangeLog second/file.c
+
+
 2002-08-18 22:33:31 GMT	Ethan Benson <erbenson@alaska.net>	patch-27
 
     Summary:
diff --git a/second/file.c b/second/file.c
index 0278dfa..4a44ba3 100644
--- a/second/file.c
+++ b/second/file.c
@@ -166,7 +166,7 @@ file_block_open(	struct boot_file_t*	file,
 		  p->part_number, p->part_start, p->part_size );
 	  if (partition == -1) {
 	       file->fs = fs_open( file, dev_name, p, file_name );
-	       if (file->fs != NULL)
+	       if (file->fs != FILE_ERR_OK)
 		    goto bail;
 	  }
 	  if ((partition >= 0) && (partition == p->part_number))