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

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index 74dc196..072536c 100644
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * 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 [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * 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/
@@ -40,21 +40,15 @@
 
 #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)++);
@@ -63,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);
@@ -85,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);