X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fuuid.c;h=cc0092687511b74e9bdf1033f15daa7abdb4844a;hb=1cf11e1cf9a55fa71c873a5f485be4b63e3a5e39;hp=cbcebb2a6c2ed3f70f0535e2d261e2f4b437d6fa;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index cbcebb2a..cc00926 100644
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -1,69 +1,78 @@
 /*
- * 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
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU 
- * Library General Public License.
- * %End-Header%
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/obdclass/uuid.c
+ *
+ * Public include file for the UUID library
  */
-#define DEBUG_SUBSYSTEM S_CLASS
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
+#define DEBUG_SUBSYSTEM S_CLASS
 
+#include <libcfs/libcfs.h>
 #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 size_t consume(size_t nob, __u8 **ptr)
 {
-        __u8    *ptr = in;
-        __u32   tmp;
+	size_t value;
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_low = tmp;
+	LASSERT(nob <= sizeof(value));
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_mid = tmp;
+	for (value = 0; nob > 0; --nob)
+		value = (value << 8) | *((*ptr)++);
+	return value;
+}
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_hi_and_version = tmp;
+#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->clock_seq = tmp;
+static void uuid_unpack(class_uuid_t in, __u16 *uu, size_t nr)
+{
+	__u8 *ptr = in;
 
-        memcpy(uu->node, ptr, 6);
-}
+	LASSERT(nr * sizeof(*uu) == sizeof(class_uuid_t));
 
-void generate_random_uuid(unsigned char uuid_out[16]);
+	while (nr-- > 0)
+		CONSUME(uu[nr], &ptr);
+}
 
 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]);
 }
+EXPORT_SYMBOL(class_uuid_unparse);