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

diff --git a/second/fs_xfs.c b/second/fs_xfs.c
index 866ceac..9a2aaa6 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);
@@ -91,7 +92,7 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 	DEBUG_F("%p was successfully opened\n", file->of_device);
 
 	xfs_file = file;
-    
+
 	if (xfs_mount() != 1)
 	{
 		DEBUG_F("Couldn't open XFS @ %s/%Lu\n", buffer, partition_offset);
@@ -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,29 +234,14 @@ 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)
 {
-	return (((xfs_fsblock_t)(le32 (r->l1) & mask32lo(9))) << 43) | 
+	return (((xfs_fsblock_t)(le32 (r->l1) & mask32lo(9))) << 43) |
 	       (((xfs_fsblock_t)le32 (r->l2)) << 11) |
 	       (((xfs_fsblock_t)le32 (r->l3)) >> 21);
 }
@@ -526,7 +512,7 @@ next_dentry (xfs_ino_t *ino)
 			++name;
 			++namelen;
 			sfe = (xfs_dir2_sf_entry_t *)
-				(inode->di_u.di_c 
+				(inode->di_u.di_c
 				 + sizeof(xfs_dir2_sf_hdr_t)
 				 - xfs.i8param);
 			break;
@@ -680,7 +666,7 @@ xfs_read_data (char *buf, int len)
 		offset = xad->offset;
 		xadlen = xad->len;
 		if (isinxt (xfs_file->pos >> xfs.blklog, offset, xadlen)) {
-			endofcur = (offset + xadlen) << xfs.blklog; 
+			endofcur = (offset + xadlen) << xfs.blklog;
 			toread = (endofcur >= endpos)
 				  ? len : (endofcur - xfs_file->pos);
 			read_disk_block(xfs_file, fsb2daddr (xad->start),
@@ -698,7 +684,7 @@ xfs_read_data (char *buf, int len)
 			}
 			continue;
 		}
-		endofprev = offset + xadlen; 
+		endofprev = offset + xadlen;
 	}
 
 	return xfs_file->pos - startpos;
@@ -792,9 +778,9 @@ xfs_dir (char *dirname)
 	}
 }
 
-/* 
+/*
  * Local variables:
- * c-file-style: "K&R"
+ * c-file-style: "k&r"
  * c-basic-offset: 8
  * End:
  */