vol_id: make the --offset= argument optional

[elogind.git] / extras / volume_id / lib / linux_raid.c

diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
index 009c714bd1d54fb8445e334f80f891f28bb5425a..af496584c45cb06e3087816c20f661ef54a85904 100644 (file)
--- a/extras/volume_id/lib/linux_raid.c
+++ b/extras/volume_id/lib/linux_raid.c
@@ -27,7 +27,7 @@
 #include "libvolume_id.h"
 #include "util.h"
 
-static struct mdp0_super_block {
+struct mdp0_super_block {
        uint32_t        md_magic;
        uint32_t        major_version;
        uint32_t        minor_version;
@@ -44,7 +44,7 @@ static struct mdp0_super_block {
        uint32_t        set_uuid1;
        uint32_t        set_uuid2;
        uint32_t        set_uuid3;
-} PACKED *mdp0;
+} PACKED;
 
 struct mdp1_super_block {
        uint32_t        magic;
@@ -53,7 +53,7 @@ struct mdp1_super_block {
        uint32_t        pad0;
        uint8_t         set_uuid[16];
        uint8_t         set_name[32];
-} PACKED *mdp1;
+} PACKED;
 
 #define MD_RESERVED_BYTES              0x10000
 #define MD_SB_MAGIC                    0xa92b4efc
@@ -61,12 +61,13 @@ struct mdp1_super_block {
 static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint64_t size)
 {
        const uint8_t *buf;
+       struct mdp0_super_block *mdp0;
        union {
                uint32_t ints[4];
                uint8_t bytes[16];
        } uuid;
 
-       info("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx\n",
            (unsigned long long) off, (unsigned long long) size);
        if (size < 0x10000)
                return -1;
@@ -78,20 +79,32 @@ 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);
-               uuid.ints[1] = bswap_32(mdp0->set_uuid1);
-               uuid.ints[2] = bswap_32(mdp0->set_uuid2);
-               uuid.ints[3] = bswap_32(mdp0->set_uuid3);
-               volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
+               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, 0, UUID_MD);
                snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
                         le32_to_cpu(mdp0->major_version),
                         le32_to_cpu(mdp0->minor_version),
                         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;
-               volume_id_set_uuid(id, uuid.bytes, UUID_DCE);
+               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, 0, UUID_MD);
                snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
                         be32_to_cpu(mdp0->major_version),
                         be32_to_cpu(mdp0->minor_version),
@@ -107,8 +120,9 @@ static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6
 static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint64_t size)
 {
        const uint8_t *buf;
+       struct mdp1_super_block *mdp1;
 
-       info("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx\n",
            (unsigned long long) off, (unsigned long long) size);
 
        buf = volume_id_get_buffer(id, off, 0x800);
@@ -119,10 +133,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)
                return -1;
 
-       volume_id_set_uuid(id, mdp1->set_uuid, UUID_DCE);
+       if (le32_to_cpu(mdp1->major_version) != 1)
+               return -1;
+
+       volume_id_set_uuid(id, mdp1->set_uuid, 0, UUID_MD);
        volume_id_set_label_raw(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);
        id->type = "linux_raid_member";
        return 0;
@@ -130,23 +146,28 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6
 
 int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-       uint64_t sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
+       uint64_t sboff;
 
        /* version 0 at the end of the device */
+       sboff = (size & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES;
        if (volume_id_probe_linux_raid0(id, off + sboff, size) == 0)
                return 0;
 
        /* version 1.0 at the end of the device */
+       sboff = (size & ~(0x1000 - 1)) - 0x2000;
        if (volume_id_probe_linux_raid1(id, off + sboff, size) == 0)
-               return 0;
+               strcpy(id->type_version, "1.0");
 
        /* version 1.1 at the start of the device */
-       if (volume_id_probe_linux_raid1(id, off, size) == 0)
-               return 0;
+       else if (volume_id_probe_linux_raid1(id, off, size) == 0)
+               strcpy(id->type_version, "1.1");
 
        /* version 1.2 at 4k offset from the start */
-       if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
-               return 0;
+       else if (volume_id_probe_linux_raid1(id, off + 0x1000, size) == 0)
+               strcpy(id->type_version, "1.2");
+
+       else
+               return -1;
 
-       return -1;
+       return 0;
 }