fs/gfs2/sys.c: use %pUB to print UUIDs
Signed-off-by: Joe Perches <joe@perches.com> Cc: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7b75c2f8cf
commit
f0b34ae634
fs/gfs2
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue