ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libblkid: support UFS UUID 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Vladimir 'φ-coder/phcoder' Serbinenko 2012-05-04 11:49:16 +02:00 committed by Karel Zak
parent fd688b6cf3
commit a767169feb
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libblkid/src/superblocks/ufs.c
View File

@ -174,6 +174,7 @@ static int probe_ufs(blkid_probe pr,
size_t i;
uint32_t magic;
struct ufs_super_block *ufs;
int is_be;
for (i = 0; i < ARRAY_SIZE(offsets); i++) {
uint32_t magLE, magBE;
@ -192,6 +193,7 @@ static int probe_ufs(blkid_probe pr,
for (y = 0; y < ARRAY_SIZE(mags); y++) {
if (magLE == mags[y] || magBE == mags[y]) {
magic = mags[y];
is_be = (magBE == mags[y]);
goto found;
}
}
@ -206,6 +208,23 @@ found:
sizeof(ufs->fs_u11.fs_u2.fs_volname));
} else
blkid_probe_set_version(pr, "1");
if (ufs->fs_id[0] || ufs->fs_id[1])
{
if (is_be)
blkid_probe_sprintf_uuid(pr,
(unsigned char *) &ufs->fs_id,
sizeof(ufs->fs_id),
"%08x%08x",
be32_to_cpu(ufs->fs_id[0]),
be32_to_cpu(ufs->fs_id[1]));
else
blkid_probe_sprintf_uuid(pr,
(unsigned char *) &ufs->fs_id,
sizeof(ufs->fs_id),
"%08x%08x",
le32_to_cpu(ufs->fs_id[0]),
le32_to_cpu(ufs->fs_id[1]));
}
if (blkid_probe_set_magic(pr,
(offsets[i] * 1024) +