X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fuuid.c;h=072536cb5f3352123d48c9bc4ad539375ffdd141;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hp=13c9dc31697ca57702e77e458ee81a7b4ad4ff0a;hpb=e903932500fc08b143467ce5a1c2702df35d8f0f;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index 13c9dc3..072536c 100644
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -1,26 +1,54 @@
 /*
- * Public include file for the UUID library
+ * 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.
+ *
+ * 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.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * 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.
  *
- * Copyright (C) 2007 Cluster File System
+ * lustre/obdclass/uuid.c
+ *
+ * Public include file for the UUID library
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#else
-# include <libcfs/libcfs.h>
-#endif
-
+#include <libcfs/libcfs.h>
 #include <obd_support.h>
 #include <obd_class.h>
 
-
-static inline __u32 consume(int nob, __u8 **ptr)
+static inline size_t consume(size_t nob, __u8 **ptr)
 {
-	__u32 value;
+	size_t value;
 
-	LASSERT(nob <= sizeof value);
+	LASSERT(nob <= sizeof(value));
 
 	for (value = 0; nob > 0; --nob)
 		value = (value << 8) | *((*ptr)++);
@@ -29,11 +57,11 @@ static inline __u32 consume(int nob, __u8 **ptr)
 
 #define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
 
-static void uuid_unpack(class_uuid_t in, __u16 *uu, int nr)
+static void uuid_unpack(class_uuid_t in, __u16 *uu, size_t nr)
 {
-        __u8 *ptr = in;
+	__u8 *ptr = in;
 
-	LASSERT(nr * sizeof *uu == sizeof(class_uuid_t));
+	LASSERT(nr * sizeof(*uu) == sizeof(class_uuid_t));
 
 	while (nr-- > 0)
 		CONSUME(uu[nr], &ptr);
@@ -51,3 +79,4 @@ void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
 		uuid[0], uuid[1], uuid[2], uuid[3],
 		uuid[4], uuid[5], uuid[6], uuid[7]);
 }
+EXPORT_SYMBOL(class_uuid_unparse);