From 6f0c44185c9ec86cfde081f19add81ff95479123 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Tue, 14 Mar 2006 13:24:46 +1100
Subject: [PATCH] --- yaml --- r: 23101 b: refs/heads/master c:
 a780143ea53d26362b7cfb6666c8d04fb989bb7a h: refs/heads/master i:   23099:
 e2ab5abc81adc694664db277abe493a49dc43889 v: v3

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

diff --git a/[refs] b/[refs]
index d269dadcc733..0e6f08a3a224 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8234a6871aa0de1ed0aeeecb5230ecf3ab414e2
+refs/heads/master: a780143ea53d26362b7cfb6666c8d04fb989bb7a
diff --git a/trunk/fs/xfs/support/uuid.c b/trunk/fs/xfs/support/uuid.c
index a3d565a67734..e157015c70ff 100644
--- a/trunk/fs/xfs/support/uuid.c
+++ b/trunk/fs/xfs/support/uuid.c
@@ -21,13 +21,6 @@ static mutex_t	uuid_monitor;
 static int	uuid_table_size;
 static uuid_t	*uuid_table;
 
-void
-uuid_init(void)
-{
-	mutex_init(&uuid_monitor);
-}
-
-
 /* IRIX interpretation of an uuid_t */
 typedef struct {
 	__be32	uu_timelow;
@@ -50,7 +43,7 @@ uuid_getnodeuniq(uuid_t *uuid, int fsid [2])
 
 	fsid[0] = (be16_to_cpu(uup->uu_clockseq) << 16) |
 		   be16_to_cpu(uup->uu_timemid);
-	fsid[1] = be16_to_cpu(uup->uu_timelow);
+	fsid[1] = be32_to_cpu(uup->uu_timelow);
 }
 
 void
@@ -139,3 +132,9 @@ uuid_table_remove(uuid_t *uuid)
 	ASSERT(i < uuid_table_size);
 	mutex_unlock(&uuid_monitor);
 }
+
+void
+uuid_init(void)
+{
+	mutex_init(&uuid_monitor);
+}