Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5560 llite: basic support of SELinux in CLIO
[fs/lustre-release.git]
/
lustre
/
obdclass
/
uuid.c
diff --git
a/lustre/obdclass/uuid.c
b/lustre/obdclass/uuid.c
index
40fb984
..
072536c
100644
(file)
--- a/
lustre/obdclass/uuid.c
+++ b/
lustre/obdclass/uuid.c
@@
-26,6
+26,8
@@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* 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/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-38,21
+40,15
@@
#define DEBUG_SUBSYSTEM S_CLASS
#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>
#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)++);
for (value = 0; nob > 0; --nob)
value = (value << 8) | *((*ptr)++);
@@
-61,11
+57,11
@@
static inline __u32 consume(int nob, __u8 **ptr)
#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
-static void uuid_unpack(class_uuid_t in, __u16 *uu,
in
t 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);
while (nr-- > 0)
CONSUME(uu[nr], &ptr);