X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs.c;h=2ae70669eb7652fd1c9f1b142f0c0a7e622aca55;hp=b5ba2ca655925081307e9dec7debdba8b0824a32;hb=1f0aaa620e99229cb0777c0e438e89f3d7b6e082;hpb=f4ebbd9f7ea23e3f0fcbe098754580c220894628

diff --git a/second/fs.c b/second/fs.c
index b5ba2ca..2ae7066 100644
--- a/second/fs.c
+++ b/second/fs.c
@@ -1,51 +1,75 @@
 /*
-    FileSystems common definitions
-
-    Copyright (C) 1999 Benjamin Herrenschmidt
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ *  fs.c - Filesystem common definitions
+ *
+ *  Copyright (C) 2001, 2002 Ethan Benson
+ *
+ *  Copyright (C) 1999 Benjamin Herrenschmidt
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
 
 #include "stdlib.h"
 #include "fs.h"
+#include "errors.h"
 
 extern const struct fs_t	of_filesystem;
 extern const struct fs_t	of_net_filesystem;
 extern const struct fs_t	ext2_filesystem;
-extern const struct fs_t        reiserfs_filesystem;
 //extern const struct fs_t	iso_filesystem;
 
+/* Configurable filesystems */
+
+#ifdef CONFIG_FS_XFS
+extern const struct fs_t        xfs_filesystem;
+#endif /* CONFIG_FS_XFS */
+
+#ifdef CONFIG_FS_REISERFS
+extern const struct fs_t        reiserfs_filesystem;
+#endif /* CONFIG_FS_REISERFS */
+
 /* Filesystem handlers yaboot knows about */
 static const struct fs_t *block_filesystems[] = {
-	&ext2_filesystem,		/* ext2 */
-	&reiserfs_filesystem,		/* reiserfs */
-	&of_filesystem,			/* HFS/HFS+, ISO9660, UDF, UFS */
-	NULL
+     &ext2_filesystem,		/* ext2 */
+#ifdef CONFIG_FS_XFS
+     &xfs_filesystem,                /* XFS */
+#endif /* CONFIG_FS_XFS */
+#ifdef CONFIG_FS_REISERFS
+     &reiserfs_filesystem,		/* reiserfs */
+#endif /* CONFIG_FS_REISERFS */
+     &of_filesystem,			/* HFS/HFS+, ISO9660, UDF, UFS */
+     NULL
 };
 
 const struct fs_t *fs_of = &of_filesystem;              /* needed by ISO9660 */
 const struct fs_t *fs_of_netboot = &of_net_filesystem;  /* needed by file.c */
 
 const struct fs_t *
-fs_open( struct boot_file_t *file, const char *dev_name,
-         struct partition_t *part, const char *file_name)
+fs_open(struct boot_file_t *file, const char *dev_name,
+	struct partition_t *part, const char *file_name)
 {
-    const struct fs_t **fs;
-    for( fs = block_filesystems; *fs; fs++ )
-        if( (*fs)->open( file, dev_name, part, file_name ) == FILE_ERR_OK )
-            break;
+     const struct fs_t **fs;
+     for (fs = block_filesystems; *fs; fs++)
+	  if ((fserrorno = (*fs)->open(file, dev_name, part, file_name)) != FILE_ERR_BAD_FSYS)
+	       break;
 
-    return *fs;
+     return *fs;
 }
+
+/* 
+ * Local variables:
+ * c-file-style: "k&r"
+ * c-basic-offset: 5
+ * End:
+ */