evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: lustre: obdclass: simplify class_uuid_unparse

Browse source 
This patch simplifies uuid unparse logic by using sprintf "%pU" extension.
And eliminates the code with a coding style error:

ERROR: Macros with complex values should be enclosed in parentheses
+#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))

Signed-off-by: Vasiliy Korchagin <vasiliy.korchagin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vasiliy Korchagin 2015-07-15 00:40:40 +00:00 • committed by Greg Kroah-Hartman
parent 6f14cc18f8
commit 4bdc190a92
1 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/staging/lustre/lustre/obdclass/uuid.c
View file

@ -43,40 +43,8 @@
#include "../include/obd_support.h" #include "../include/obd_support.h"
#include "../include/obd_class.h" #include "../include/obd_class.h"
static inline __u32 consume(int nob, __u8 **ptr)
{
__u32 value;
LASSERT(nob <= sizeof(value));
for (value = 0; nob > 0; --nob)
value = (value << 8) | *((*ptr)++);
return value;
}
#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
static void uuid_unpack(class_uuid_t in, __u16 *uu, int nr)
{
__u8 *ptr = in;
LASSERT(nr * sizeof(*uu) == sizeof(class_uuid_t));
while (nr-- > 0)
CONSUME(uu[nr], &ptr);
}
void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out) void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
{ {
/* uu as an array of __u16's */ sprintf(out->uuid, "%pU", uu);
__u16 uuid[sizeof(class_uuid_t) / sizeof(__u16)];
CLASSERT(ARRAY_SIZE(uuid) == 8);
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); EXPORT_SYMBOL(class_uuid_unparse);