Merge branch 'linus' into x86/doc

[linux-2.6-omap-h63xx.git] / fs / xfs / support / uuid.c

diff --git a/fs/xfs/support/uuid.c b/fs/xfs/support/uuid.c
index a3d565a67734e0df236b42fd933d24f1a90393e9..5830c040ea7ebba66274eeebbdab553c206ab981 100644 (file)
--- a/fs/xfs/support/uuid.c
+++ b/fs/xfs/support/uuid.c
@@ -17,17 +17,10 @@
  */
 #include <xfs.h>
 
-static mutex_t uuid_monitor;
+static DEFINE_MUTEX(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