chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
900878a
)
volume_id: old md metadata has only 32 bit for the uuid
author
Kay Sievers
<kay.sievers@vrfy.org>
Sat, 28 Apr 2007 21:06:20 +0000
(23:06 +0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Sat, 28 Apr 2007 21:06:20 +0000
(23:06 +0200)
extras/volume_id/lib/linux_raid.c
patch
|
blob
|
history
diff --git
a/extras/volume_id/lib/linux_raid.c
b/extras/volume_id/lib/linux_raid.c
index 009c714bd1d54fb8445e334f80f891f28bb5425a..8ce2eb52daa9ff1f84054725334a64ce1ae7227f 100644
(file)
--- a/
extras/volume_id/lib/linux_raid.c
+++ b/
extras/volume_id/lib/linux_raid.c
@@
-78,9
+78,15
@@
static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
if (le32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) {
uuid.ints[0] = bswap_32(mdp0->set_uuid0);
if (le32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) {
uuid.ints[0] = bswap_32(mdp0->set_uuid0);
- uuid.ints[1] = bswap_32(mdp0->set_uuid1);
- uuid.ints[2] = bswap_32(mdp0->set_uuid2);
- uuid.ints[3] = bswap_32(mdp0->set_uuid3);
+ if (le32_to_cpu(mdp0->minor_version >= 90)) {
+ uuid.ints[1] = bswap_32(mdp0->set_uuid1);
+ uuid.ints[2] = bswap_32(mdp0->set_uuid2);
+ uuid.ints[3] = bswap_32(mdp0->set_uuid3);
+ } else {
+ uuid.ints[1] = 0;
+ uuid.ints[2] = 0;
+ uuid.ints[3] = 0;
+ }
volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
le32_to_cpu(mdp0->major_version),
volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
le32_to_cpu(mdp0->major_version),
@@
-88,9
+94,15
@@
static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
le32_to_cpu(mdp0->patch_version));
} else if (be32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) {
uuid.ints[0] = mdp0->set_uuid0;
le32_to_cpu(mdp0->patch_version));
} else if (be32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) {
uuid.ints[0] = mdp0->set_uuid0;
- uuid.ints[1] = mdp0->set_uuid1;
- uuid.ints[2] = mdp0->set_uuid2;
- uuid.ints[3] = mdp0->set_uuid3;
+ if (be32_to_cpu(mdp0->minor_version >= 90)) {
+ uuid.ints[1] = mdp0->set_uuid1;
+ uuid.ints[2] = mdp0->set_uuid2;
+ uuid.ints[3] = mdp0->set_uuid3;
+ } else {
+ uuid.ints[1] = 0;
+ uuid.ints[2] = 0;
+ uuid.ints[3] = 0;
+ }
volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
be32_to_cpu(mdp0->major_version),
volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
be32_to_cpu(mdp0->major_version),