* [Cluster-devel] [PATCH 7/9] fs/gfs2/sys.c: Use %pUX to print UUIDs [not found] <cover.1254193019.git.joe@perches.com> @ 2009-09-29 5:01 ` Joe Perches 2009-09-29 8:50 ` [Cluster-devel] " Steven Whitehouse 0 siblings, 1 reply; 2+ messages in thread From: Joe Perches @ 2009-09-29 5:01 UTC (permalink / raw) To: cluster-devel.redhat.com Signed-off-by: Joe Perches <joe@perches.com> --- fs/gfs2/sys.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index 4463297..56901be 100644 --- a/fs/gfs2/sys.c +++ b/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, "%pUX\n", uuid); } static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf) @@ -573,14 +569,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=%pUX", uuid); return 0; } -- 1.6.3.1.10.g659a0.dirty ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Cluster-devel] Re: [PATCH 7/9] fs/gfs2/sys.c: Use %pUX to print UUIDs 2009-09-29 5:01 ` [Cluster-devel] [PATCH 7/9] fs/gfs2/sys.c: Use %pUX to print UUIDs Joe Perches @ 2009-09-29 8:50 ` Steven Whitehouse 0 siblings, 0 replies; 2+ messages in thread From: Steven Whitehouse @ 2009-09-29 8:50 UTC (permalink / raw) To: cluster-devel.redhat.com Hi, Provided this gives identical output and people are happy with the general concept, then: Acked-by: Steven Whitehouse <swhiteho@redhat.com> Looks like a nice cleanup, Steve. On Mon, 2009-09-28 at 22:01 -0700, Joe Perches wrote: > Signed-off-by: Joe Perches <joe@perches.com> > --- > fs/gfs2/sys.c | 16 +++------------- > 1 files changed, 3 insertions(+), 13 deletions(-) > > diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c > index 4463297..56901be 100644 > --- a/fs/gfs2/sys.c > +++ b/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, "%pUX\n", uuid); > } > > static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf) > @@ -573,14 +569,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=%pUX", uuid); > return 0; > } > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-29 8:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1254193019.git.joe@perches.com>
2009-09-29 5:01 ` [Cluster-devel] [PATCH 7/9] fs/gfs2/sys.c: Use %pUX to print UUIDs Joe Perches
2009-09-29 8:50 ` [Cluster-devel] " Steven Whitehouse
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).