[PATCH] staging: lustre: obdclass: simplify class_uuid_unparse

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Vasiliy Korchagin <vasiliy.korchagin@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] staging: lustre: obdclass: simplify class_uuid_unparse
Date	Wed, 15 Jul 2015 01:50:01 +0200
Message-ID	<pMi7v-72M-3@gated-at.bofh.it> (permalink)
References	<pJtiO-1md-3@gated-at.bofh.it>
X-Original-To	oleg.drokin@intel.com, andreas.dilger@intel.com
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XyoUu6a4bWfsadOO5QoWQgdK7KThgtiorARXgbBq3os=; b=LsSTV+fmuZ4FnrqHqScQ/s8zre2L44J5Du7auuHfCLwpkd5/ycztbumvko5FZqduxx cUH532XRF09CWl9qNspAc7G02Zp3VOTc1lSe06I82/gkqebYX1wh+Wl0RzcCJS04IYKu lBleK1I3VYCmbNjc8wUK7CIq73937Xq4LSpDo/0gts40OZ2fZkX3iNE0bdyS+lH3zAI5 RJjBVAwGsKUKqhxA5Rv479njPOClCYBbjsqhvLg2lTcp4FGM7TE75repyd45NoZMz3Wt 6XPzolu5V/NJTtxYA/qNlSFtE4PkM+d2hPLx711vKjB1NZDunmoWlUV2A/i8Gma2GrVN WnXg==
X-Received	by 10.180.9.75 with SMTP id x11mr9653625wia.80.1436917284809; Tue, 14 Jul 2015 16:41:24 -0700 (PDT)
X-Mailer	git-send-email 2.4.5
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	65
Organization	linux.* mail to news gateway
X-Original-Cc	gregkh@linuxfoundation.org, vasiliy.korchagin@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, joe@perches.com
X-Original-Date	Wed, 15 Jul 2015 00:40:40 +0000
X-Original-Message-ID	<1436920840-18211-1-git-send-email-vasiliy.korchagin@gmail.com>
X-Original-References	<1436245271.2682.32.camel@perches.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1184138

Show key headers only | View raw

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>
---
 drivers/staging/lustre/lustre/obdclass/uuid.c | 34 +--------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/uuid.c b/drivers/staging/lustre/lustre/obdclass/uuid.c
index ff0a01b..b0b0157 100644
--- a/drivers/staging/lustre/lustre/obdclass/uuid.c
+++ b/drivers/staging/lustre/lustre/obdclass/uuid.c
@@ -43,40 +43,8 @@
 #include "../include/obd_support.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)
 {
-	/* uu as an array of __u16's */
-	__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]);
+	sprintf(out->uuid, "%pU", uu);
 }
 EXPORT_SYMBOL(class_uuid_unparse);
-- 
2.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] staging: lustre: obdclass: simplify class_uuid_unparse Vasiliy Korchagin <vasiliy.korchagin@gmail.com> - 2015-07-15 01:50 +0200

csiph-web