X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fddf_raid.c;h=de7b7a7b6367f783bf8f49c5338b7d4163140c33;hp=60837a48b17e71ac5b1d78aa51d7783f37913b06;hb=2603474ff9be2418900581da1af5cccc9f13cae1;hpb=c70560feef0eb61a150cd2f956f0beead4313ffe diff --git a/extras/volume_id/lib/ddf_raid.c b/extras/volume_id/lib/ddf_raid.c index 60837a48b..de7b7a7b6 100644 --- a/extras/volume_id/lib/ddf_raid.c +++ b/extras/volume_id/lib/ddf_raid.c @@ -25,6 +25,7 @@ #include #include "libvolume_id.h" +#include "libvolume_id-private.h" #include "util.h" /* http://www.snia.org/standards/home */ @@ -33,17 +34,18 @@ #define DDF_GUID_LENGTH 24 #define DDF_REV_LENGTH 8 -static struct ddf_header { +struct ddf_header { uint32_t signature; uint32_t crc; uint8_t guid[DDF_GUID_LENGTH]; uint8_t ddf_rev[DDF_REV_LENGTH]; -} PACKED *ddf; +} PACKED; int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size) { uint64_t ddf_off = ((size / 0x200)-1) * 0x200; const uint8_t *buf; + struct ddf_header *ddf; info("probing at offset 0x%llx, size 0x%llx\n", (unsigned long long) off, (unsigned long long) size);