mirror of
https://github.com/AuxXxilium/eudev.git
synced 2024-12-28 06:35:34 +07:00
volume_id: md - add metadata minor version
Thanks to Hannes.
This commit is contained in:
parent
6bdec550af
commit
9e5920842b
@ -131,10 +131,12 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
|
|||||||
if (le32_to_cpu(mdp1->magic) != MD_SB_MAGIC)
|
if (le32_to_cpu(mdp1->magic) != MD_SB_MAGIC)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
if (le32_to_cpu(mdp1->major_version) != 1)
|
||||||
|
return -1;
|
||||||
|
|
||||||
volume_id_set_uuid(id, mdp1->set_uuid, 0, UUID_FOURINT);
|
volume_id_set_uuid(id, mdp1->set_uuid, 0, UUID_FOURINT);
|
||||||
volume_id_set_label_raw(id, mdp1->set_name, 32);
|
volume_id_set_label_raw(id, mdp1->set_name, 32);
|
||||||
volume_id_set_label_string(id, mdp1->set_name, 32);
|
volume_id_set_label_string(id, mdp1->set_name, 32);
|
||||||
snprintf(id->type_version, sizeof(id->type_version)-1, "%u", le32_to_cpu(mdp1->major_version));
|
|
||||||
volume_id_set_usage(id, VOLUME_ID_RAID);
|
volume_id_set_usage(id, VOLUME_ID_RAID);
|
||||||
id->type = "linux_raid_member";
|
id->type = "linux_raid_member";
|
||||||
return 0;
|
return 0;
|
||||||
@ -151,16 +153,22 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size
|
|||||||
|
|
||||||
/* version 1.0 at the end of the device */
|
/* version 1.0 at the end of the device */
|
||||||
sboff = (size & ~(0x1000 - 1)) - 0x2000;
|
sboff = (size & ~(0x1000 - 1)) - 0x2000;
|
||||||
if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
|
if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0) {
|
||||||
|
strcpy(id->type_version, "1.0");
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* version 1.1 at the start of the device */
|
/* version 1.1 at the start of the device */
|
||||||
if (volume_id_probe_linux_raid1(id, off, size) == 0)
|
if (volume_id_probe_linux_raid1(id, off, size) == 0) {
|
||||||
|
strcpy(id->type_version, "1.1");
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* version 1.2 at 4k offset from the start */
|
/* version 1.2 at 4k offset from the start */
|
||||||
if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
|
if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0) {
|
||||||
|
strcpy(id->type_version, "1.2");
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user