From ab532317f01b4cac194d7437543a9c1a10037544 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@sgi.com>
Date: Wed, 11 Jan 2006 15:37:17 +1100
Subject: [PATCH] --- yaml --- r: 18166 b: refs/heads/master c:
 794fe2dc65f1ec4acacc388053bb52d32d3a932e h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/fs/xfs/support/uuid.c | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d1dbfd5b296b..de9a28d44c07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60a204f096dd67683f3993798e14905ee9828ba5
+refs/heads/master: 794fe2dc65f1ec4acacc388053bb52d32d3a932e
diff --git a/trunk/fs/xfs/support/uuid.c b/trunk/fs/xfs/support/uuid.c
index 69ec4f540c3a..a3d565a67734 100644
--- a/trunk/fs/xfs/support/uuid.c
+++ b/trunk/fs/xfs/support/uuid.c
@@ -27,6 +27,16 @@ uuid_init(void)
 	mutex_init(&uuid_monitor);
 }
 
+
+/* IRIX interpretation of an uuid_t */
+typedef struct {
+	__be32	uu_timelow;
+	__be16	uu_timemid;
+	__be16	uu_timehi;
+	__be16	uu_clockseq;
+	__be16	uu_node[3];
+} xfs_uu_t;
+
 /*
  * uuid_getnodeuniq - obtain the node unique fields of a UUID.
  *
@@ -36,16 +46,11 @@ uuid_init(void)
 void
 uuid_getnodeuniq(uuid_t *uuid, int fsid [2])
 {
-	char	*uu = (char *)uuid;
-
-	/* on IRIX, this function assumes big-endian fields within
-	 * the uuid, so we use INT_GET to get the same result on
-	 * little-endian systems
-	 */
+	xfs_uu_t *uup = (xfs_uu_t *)uuid;
 
-	fsid[0] = (INT_GET(*(u_int16_t*)(uu+8), ARCH_CONVERT) << 16) +
-		   INT_GET(*(u_int16_t*)(uu+4), ARCH_CONVERT);
-	fsid[1] =  INT_GET(*(u_int32_t*)(uu  ), ARCH_CONVERT);
+	fsid[0] = (be16_to_cpu(uup->uu_clockseq) << 16) |
+		   be16_to_cpu(uup->uu_timemid);
+	fsid[1] = be16_to_cpu(uup->uu_timelow);
 }
 
 void