X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_xfs.c;h=1bfadba0070d7fe7129de3574b8436ead05f636a;hp=866ceacfb1406b469f5cd64d6ec30b7d5e928ef9;hb=c8468c1549669e3f06387ab6a162e5d6498c6de7;hpb=8d5a42062f8b88eaea91434e53973ce9f55589d9

diff --git a/second/fs_xfs.c b/second/fs_xfs.c
index 866ceac..1bfadba 100644
--- a/second/fs_xfs.c
+++ b/second/fs_xfs.c
@@ -1,11 +1,11 @@
 /*
- *  fsys_xfs.c - an implementation for the SGI XFS file system
+ *  fs_xfs.c - an implementation for the SGI XFS file system
  *
- *  Copyright (C) 2001  Ethan Benson
+ *  Copyright (C) 2001, 2002 Ethan Benson
  *
  *  Adapted from Grub
  *
- *  Copyright (C) 2001  Serguei Tzukanov
+ *  Copyright (C) 2001 Serguei Tzukanov
  *
  *  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
@@ -19,7 +19,7 @@
  *
  *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 #include "types.h"
@@ -29,6 +29,7 @@
 #include "fs.h"
 #include "xfs/xfs.h"
 #include "errors.h"
+#include "debug.h"
 
 #define SECTOR_BITS 9
 
@@ -53,7 +54,7 @@ struct fs_t xfs_filesystem = {
 
 struct boot_file_t *xfs_file;
 static char FSYS_BUF[32768];
-__u64 partition_offset;
+uint64_t partition_offset;
 int errnum;
 
 static int
@@ -68,7 +69,7 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 	if (part)
 	{
 		DEBUG_F("Determining offset for partition %d\n", part->part_number);
-		partition_offset = ((__u64)(part->part_start)) * ((__u64)part->blocksize);
+		partition_offset = ((uint64_t) part->part_start) * part->blocksize;
 		DEBUG_F("%Lu = %lu * %hu\n", partition_offset,
 			part->part_start,
 			part->blocksize);
@@ -144,12 +145,12 @@ xfs_close(struct boot_file_t *file)
 }
 
 static int
-read_disk_block(struct boot_file_t *file, __u32 block, __u32 start,
-		__u32 length, void *buf)
+read_disk_block(struct boot_file_t *file, uint64_t block, int start,
+		int length, void *buf)
 {
-	unsigned long long pos = block * 512;
+	uint64_t pos = block * 512;
 	pos += partition_offset + start;
-	DEBUG_F("Reading %u bytes, starting at block %u, disk offset %Lu\n",
+	DEBUG_F("Reading %d bytes, starting at block %Lu, disk offset %Lu\n",
 		length, block, pos);
 	if (!prom_lseek(file->of_device, pos)) {
 		DEBUG_F("prom_lseek failed\n");
@@ -233,24 +234,9 @@ ino2offset (xfs_ino_t ino)
 }
 
 /* XFS is big endian, powerpc is big endian */
-
-static inline __const__ __uint16_t
-le16 (__uint16_t x)
-{
-	return x;
-}
-
-static inline __const__ __uint32_t
-le32 (__uint32_t x)
-{
-	return x;
-}
-
-static inline __const__ __uint64_t
-le64 (__uint64_t x)
-{
-	return x;
-}
+#define le16(x) (x)
+#define le32(x) (x)
+#define le64(x) (x)
 
 static xfs_fsblock_t
 xt_start (xfs_bmbt_rec_32_t *r)
@@ -794,7 +780,7 @@ xfs_dir (char *dirname)
 
 /* 
  * Local variables:
- * c-file-style: "K&R"
+ * c-file-style: "k&r"
  * c-basic-offset: 8
  * End:
  */