X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flinux_raid.c;h=e84557082395cf6ca6700078d92919514367a2fe;hb=387a8271207b4e921258194cf359039babbc33b9;hp=3c2e86e422490f08ad6b4bf5deb0984442435e90;hpb=9e5920842b0b414e78b04ddd40fb4cf29b0d855c;p=elogind.git diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c index 3c2e86e42..e84557082 100644 --- a/extras/volume_id/lib/linux_raid.c +++ b/extras/volume_id/lib/linux_raid.c @@ -3,19 +3,24 @@ * * Copyright (C) 2004 Kay Sievers * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2 of the License. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #ifndef _GNU_SOURCE #define _GNU_SOURCE 1 #endif -#ifdef HAVE_CONFIG_H -# include -#endif - #include #include #include @@ -25,9 +30,9 @@ #include #include "libvolume_id.h" -#include "util.h" +#include "libvolume_id-private.h" -static struct mdp0_super_block { +struct mdp0_super_block { uint32_t md_magic; uint32_t major_version; uint32_t minor_version; @@ -44,7 +49,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 +58,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,13 +66,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", - (unsigned long long) off, (unsigned long long) size); + info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size); if (size < 0x10000) return -1; @@ -87,7 +92,7 @@ static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6 uuid.ints[2] = 0; uuid.ints[3] = 0; } - volume_id_set_uuid(id, uuid.bytes, 0, UUID_FOURINT); + 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), @@ -103,7 +108,7 @@ static int volume_id_probe_linux_raid0(struct volume_id *id, uint64_t off, uint6 uuid.ints[2] = 0; uuid.ints[3] = 0; } - volume_id_set_uuid(id, uuid.bytes, 0, UUID_FOURINT); + 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), @@ -119,9 +124,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", - (unsigned long long) off, (unsigned long long) size); + info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size); buf = volume_id_get_buffer(id, off, 0x800); if (buf == NULL) @@ -134,7 +139,7 @@ static int volume_id_probe_linux_raid1(struct volume_id *id, uint64_t off, uint6 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_MD); volume_id_set_label_raw(id, mdp1->set_name, 32); volume_id_set_label_string(id, mdp1->set_name, 32); volume_id_set_usage(id, VOLUME_ID_RAID); @@ -146,16 +151,18 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size { 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) { - strcpy(id->type_version, "1.0"); - return 0; + if (size > MD_RESERVED_BYTES) { + /* 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) { + strcpy(id->type_version, "1.0"); + return 0; + } } /* version 1.1 at the start of the device */