volume_id: remove s390 dasd handling, it is dasd_id now

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

diff --git a/extras/volume_id/volume_id/linux_raid.c b/extras/volume_id/volume_id/linux_raid.c
index 0ea8596ad67cd1bd0804f9a4462b16ef10d8b60f..598002ec4f445290d0106eb63a397bdddfe3f2f4 100644 (file)
--- a/extras/volume_id/volume_id/linux_raid.c
+++ b/extras/volume_id/volume_id/linux_raid.c
@@ -67,7 +67,8 @@ int volume_id_probe_linux_raid(struct volume_id *id, __u64 off, __u64 size)
        __u64 sboff;
        __u8 uuid[16];
 
-       dbg("probing at offset %llu", off);
+       dbg("probing at offset 0x%llx, size 0x%llx",
+           (unsigned long long) off, (unsigned long long) size);
 
        if (size < 0x10000)
                return -1;
@@ -86,7 +87,7 @@ int volume_id_probe_linux_raid(struct volume_id *id, __u64 off, __u64 size)
        memcpy(&uuid[4], &mdp->set_uuid1, 12);
        volume_id_set_uuid(id, uuid, UUID_DCE);
 
-       snprintf(id->type_version, VOLUME_ID_FORMAT_SIZE-1, "%u.%u.%u",
+       snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
                 le32_to_cpu(mdp->major_version),
                 le32_to_cpu(mdp->minor_version),
                 le32_to_cpu(mdp->patch_version));