From 1bf0f816930b489822d252bffff666c5384833c9 Mon Sep 17 00:00:00 2001
From: nikita <nikita>
Date: Wed, 12 Sep 2007 19:11:23 +0000
Subject: [PATCH] rewrite inherited code in obdclass/uuid.c (uuid parsing code
 from ext2 utils) from scratch preserving functionality. b=13532 i=adilger
 i=alex i=green

---
 lustre/ChangeLog       |  5 ++++
 lustre/obdclass/uuid.c | 70 +++++++++++++++++++-------------------------------
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index b362f2e..7f8bd17 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -226,6 +226,11 @@ Details    : Set the value of /sys/block/{dev}/queue/max_sectors_kb
              to the value of /sys/block/{dev}/queue/max_hw_sectors_kb
              in mount_lustre.
 
+Severity   : cleanup
+Bugzilla   : 13532
+Description: rewrite ext2-derived code in obdclass/uuid.c
+Details    : rewrite inherited code (uuid parsing code from ext2 utils)
+	     from scratch preserving functionality.
 --------------------------------------------------------------------------------
 
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>
diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index cbcebb2a..5783e09 100644
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -1,69 +1,53 @@
 /*
  * Public include file for the UUID library
- * 
- * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
- * Copyright (C) 2002 Cluster File System
- * - changed for use in lustre
  *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU 
- * Library General Public License.
- * %End-Header%
+ * Copyright (C) 2007 Cluster File System
  */
+
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #ifndef __KERNEL__
 # include <liblustre.h>
+#else
+# include <libcfs/kp30.h>
 #endif
 
 #include <obd_support.h>
 #include <obd_class.h>
 
-struct uuid {
-        __u32   time_low;
-        __u16   time_mid;
-        __u16   time_hi_and_version;
-        __u16   clock_seq;
-        __u8    node[6];
-};
 
-static void uuid_unpack(class_uuid_t in, struct uuid *uu)
+static inline __u32 consume(int nob, __u8 **ptr)
 {
-        __u8    *ptr = in;
-        __u32   tmp;
+	__u32 value;
+
+	LASSERT(nob <= sizeof value);
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_low = tmp;
+	for (value = 0; nob > 0; --nob)
+		value = (value << 8) | *((*ptr)++);
+	return value;
+}
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_mid = tmp;
+#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_hi_and_version = tmp;
+static void uuid_unpack(class_uuid_t in, __u16 *uu, int nr)
+{
+        __u8 *ptr = in;
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->clock_seq = tmp;
+	LASSERT(nr * sizeof *uu == sizeof(class_uuid_t));
 
-        memcpy(uu->node, ptr, 6);
+	while (nr-- > 0)
+		CONSUME(uu[nr], &ptr);
 }
 
-void generate_random_uuid(unsigned char uuid_out[16]);
-
 void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
 {
-        struct uuid uuid;
+	/* uu as an array of __u16's */
+        __u16 uuid[sizeof(class_uuid_t) / sizeof(__u16)];
+
+	CLASSERT(ARRAY_SIZE(uuid) == 8);
 
-        uuid_unpack(uu, &uuid);
-        sprintf(out->uuid,
-                "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-                uuid.time_low, uuid.time_mid, uuid.time_hi_and_version,
-                uuid.clock_seq >> 8, uuid.clock_seq & 0xFF,
-                uuid.node[0], uuid.node[1], uuid.node[2],
-                uuid.node[3], uuid.node[4], uuid.node[5]);
+        uuid_unpack(uu, uuid, ARRAY_SIZE(uuid));
+        sprintf(out->uuid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+		uuid[0], uuid[1], uuid[2], uuid[3],
+		uuid[4], uuid[5], uuid[6], uuid[7]);
 }
-- 
1.8.3.1