From 35903fc43cebfbc8f0f025715766be8eba7013ad Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 14 Dec 2009 18:01:13 -0800
Subject: [PATCH] --- yaml --- r: 176383 b: refs/heads/master c:
 f0b34ae63488fecf0ec4ab42024d607917f90c45 h: refs/heads/master i:   176381:
 a9e5093d7348b82ec0f0b014506ba3056063d986   176379:
 1c847fbd5014f17bb7aac4d1a01e148822099c19   176375:
 7d4e4886d160b4df60ee228898d3933048f9bda6   176367:
 f3304b5884f41859be6ea383e715e986d033e1a7   176351:
 07c28ed50dc6dc7b13cdc364df8de0315d5fef9a   176319:
 350c46303e91198db62b3960d10c7664a4c1258c   176255:
 5babe8858465afb5b1f44a0a0f6daa3d2b7dc6d4   176127:
 a3c9286093c316d55dd0304954cfc6b69e995922 v: v3

---
 [refs]              |  2 +-
 trunk/fs/gfs2/sys.c | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 5d83bf1b84aa..5e151927598b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b75c2f8cf6d938b571d3bc3f566f883ab7472c4
+refs/heads/master: f0b34ae63488fecf0ec4ab42024d607917f90c45
diff --git a/trunk/fs/gfs2/sys.c b/trunk/fs/gfs2/sys.c
index c5dad1eb7b91..0dc34621f6a6 100644
--- a/trunk/fs/gfs2/sys.c
+++ b/trunk/fs/gfs2/sys.c
@@ -85,11 +85,7 @@ static ssize_t uuid_show(struct gfs2_sbd *sdp, char *buf)
 	buf[0] = '\0';
 	if (!gfs2_uuid_valid(uuid))
 		return 0;
-	return snprintf(buf, PAGE_SIZE, "%02X%02X%02X%02X-%02X%02X-"
-			"%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",
-			uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5],
-			uuid[6], uuid[7], uuid[8], uuid[9], uuid[10], uuid[11],
-			uuid[12], uuid[13], uuid[14], uuid[15]);
+	return snprintf(buf, PAGE_SIZE, "%pUB\n", uuid);
 }
 
 static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
@@ -575,14 +571,8 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj,
 	add_uevent_var(env, "LOCKPROTO=%s", sdp->sd_proto_name);
 	if (!sdp->sd_args.ar_spectator)
 		add_uevent_var(env, "JOURNALID=%u", sdp->sd_lockstruct.ls_jid);
-	if (gfs2_uuid_valid(uuid)) {
-		add_uevent_var(env, "UUID=%02X%02X%02X%02X-%02X%02X-%02X%02X-"
-			       "%02X%02X-%02X%02X%02X%02X%02X%02X",
-			       uuid[0], uuid[1], uuid[2], uuid[3], uuid[4],
-			       uuid[5], uuid[6], uuid[7], uuid[8], uuid[9],
-			       uuid[10], uuid[11], uuid[12], uuid[13],
-			       uuid[14], uuid[15]);
-	}
+	if (gfs2_uuid_valid(uuid))
+		add_uevent_var(env, "UUID=%pUB", uuid);
 	return 0;
 }