From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Sep 2013 13:37:05 +0000 (+0200)
Subject: libblkid: don't use UUID= for xfs external log
X-Git-Tag: v2.24-rc1~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b1e01762897895354c10f71b383d54a1f91271;p=thirdparty%2Futil-linux.git

libblkid: don't use UUID= for xfs external log

The log UUID is usually the same as filesystem UUID, it is bad idea to
have two devices with the same UUID in the system. It seems batter to
use only LOGUUID= for xfs external log.

 # mkfs.xfs -l logdev=/dev/sdb1 /dev/sdb2

 # blkid -p -o udev /dev/sdb1 | grep FS
 ID_FS_LOGUUID=4063d453-5c01-46ce-b92f-9523d64aecc7
 ID_FS_TYPE=xfs_external_log
 ID_FS_USAGE=other

 # blkid -p -o udev /dev/sdb2 | grep FS
 ID_FS_UUID=4063d453-5c01-46ce-b92f-9523d64aecc7
 ID_FS_TYPE=xfs
 ID_FS_USAGE=filesystem

The filesystem (sdb2) uses UUID= and log (sdb1) uses LOGUUID=.

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

diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
index 954289127d..cea1faa328 100644
--- a/libblkid/src/superblocks/xfs.c
+++ b/libblkid/src/superblocks/xfs.c
@@ -133,7 +133,6 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag)
 		rhead = (struct xlog_rec_header *)&buf[i*512];
 
 		if (xlog_valid_rec_header(rhead)) {
-			blkid_probe_set_uuid(pr, rhead->h_uuid);
 			blkid_probe_set_uuid_as(pr, rhead->h_uuid, "LOGUUID");
 			return 0;
 		}