From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Sep 2013 09:15:33 +0000 (+0200)
Subject: libblkid: populate jbd LOGUUID in addition to UUID
X-Git-Tag: v2.24-rc1~288
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bd67a19f73b5fc8d1f13e2ec0929b5bae90544b;p=thirdparty%2Futil-linux.git

libblkid: populate jbd LOGUUID in addition to UUID

The LOGUUID is alias for UUID, this alias is necessary to standardize
the tag name (we want to use the same tag LOGUUID= for all external
logs on all filesystems).

Note that for another filesystems (e.g. xfs) we have to differentiate
between the journal and filesystem uuids to avoid collisions, because
both devices use the same uuid.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c
index c23959322a..8d57cb5e46 100644
--- a/libblkid/src/superblocks/ext.c
+++ b/libblkid/src/superblocks/ext.c
@@ -333,6 +333,8 @@ static int probe_jbd(blkid_probe pr,
 		return -BLKID_ERR_PARAM;
 
 	ext_get_info(pr, 2, es);
+	blkid_probe_set_uuid_as(pr, es->s_uuid, "LOGUUID");
+
 	return 0;
 }