X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fvolume_id.c;h=f76742934772ed3cfb487cad2f4a114a7427d4ed;hp=a66b4a5769c735638f59710eb24fbf360bd6f1f4;hb=223cfa97fcd474ae16d8f98f2d3f9c2c3ad07410;hpb=444f07fea49bc40207df5e7910907492529b9bce diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c index a66b4a576..f76742934 100644 --- a/extras/volume_id/lib/volume_id.c +++ b/extras/volume_id/lib/volume_id.c @@ -28,6 +28,55 @@ #include "libvolume_id.h" #include "util.h" +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +struct prober { + volume_id_probe_fn_t prober; + const char *name[4]; +}; + +static const struct prober prober_raid[] = { + { volume_id_probe_linux_raid, { "linux_raid", } }, + { volume_id_probe_ddf_raid, { "ddf_raid", } }, + { volume_id_probe_intel_software_raid, { "isw_raid", } }, + { volume_id_probe_lsi_mega_raid, { "lsi_mega_raid", } }, + { volume_id_probe_via_raid, { "via_raid", } }, + { volume_id_probe_silicon_medley_raid, { "silicon_medley_raid", } }, + { volume_id_probe_nvidia_raid, { "nvidia_raid", } }, + { volume_id_probe_promise_fasttrack_raid, { "promise_fasttrack_raid", } }, + { volume_id_probe_highpoint_45x_raid, { "highpoint_raid", } }, + { volume_id_probe_adaptec_raid, { "adaptec_raid", } }, + { volume_id_probe_jmicron_raid, { "jmicron_raid", } }, + { volume_id_probe_lvm1, { "lvm1", } }, + { volume_id_probe_lvm2, { "lvm2", } }, + { volume_id_probe_highpoint_37x_raid, { "highpoint_raid", } }, +}; + +static const struct prober prober_filesystem[] = { + { volume_id_probe_vfat, { "vfat", } }, + { volume_id_probe_linux_swap, { "swap", } }, + { volume_id_probe_luks, { "luks", } }, + { volume_id_probe_xfs, { "xfs", } }, + { volume_id_probe_ext, { "ext2", "ext3", "jbd", } }, + { volume_id_probe_reiserfs, { "reiserfs", "reiser4", } }, + { volume_id_probe_jfs, { "jfs", } }, + { volume_id_probe_udf, { "udf", } }, + { volume_id_probe_iso9660, { "iso9660", } }, + { volume_id_probe_hfs_hfsplus, { "hfs", "hfsplus", } }, + { volume_id_probe_ufs, { "ufs", } }, + { volume_id_probe_ntfs, { "ntfs", } }, + { volume_id_probe_cramfs, { "cramfs", } }, + { volume_id_probe_romfs, { "romfs", } }, + { volume_id_probe_hpfs, { "hpfs", } }, + { volume_id_probe_sysv, { "sysv", "xenix", } }, + { volume_id_probe_minix, { "minix", } }, + { volume_id_probe_ocfs1, { "ocfs1", } }, + { volume_id_probe_ocfs2, { "ocfs2", } }, + { volume_id_probe_vxfs, { "vxfs", } }, + { volume_id_probe_squashfs, { "squashfs", } }, + { volume_id_probe_netware, { "netware", } }, +}; + /* the user can overwrite this log function */ static void default_log(int priority, const char *file, int line, const char *format, ...) { @@ -36,6 +85,24 @@ static void default_log(int priority, const char *file, int line, const char *fo volume_id_log_fn_t volume_id_log_fn = default_log; +const volume_id_probe_fn_t *volume_id_get_prober_by_type(const char *type) +{ + unsigned int p, n; + + if (type == NULL) + return NULL; + + for (p = 0; p < ARRAY_SIZE(prober_raid); p++) + for (n = 0; prober_raid[p].name[n] != NULL; n++) + if (strcmp(type, prober_raid[p].name[n]) == 0) + return &prober_raid[p].prober; + for (p = 0; p < ARRAY_SIZE(prober_filesystem); p++) + for (n = 0; prober_filesystem[p].name[n] != NULL; n++) + if (strcmp(type, prober_filesystem[p].name[n]) == 0) + return &prober_filesystem[p].prober; + return NULL; +} + int volume_id_get_label(struct volume_id *id, const char **label) { if (id == NULL) @@ -135,57 +202,17 @@ int volume_id_get_type_version(struct volume_id *id, const char **type_version) int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size) { + unsigned int i; + if (id == NULL) return -EINVAL; info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); - /* probe for raid first, because fs probes may be successful on raid members */ - if (size) { - if (volume_id_probe_linux_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_ddf_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_intel_software_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_lsi_mega_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_via_raid(id, off, size) == 0) + for (i = 0; i < ARRAY_SIZE(prober_raid); i++) + if (prober_raid[i].prober(id, off, size) == 0) goto found; - - if (volume_id_probe_silicon_medley_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_nvidia_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_promise_fasttrack_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_adaptec_raid(id, off, size) == 0) - goto found; - - if (volume_id_probe_jmicron_raid(id, off, size) == 0) - goto found; - } - - if (volume_id_probe_lvm1(id, off, size) == 0) - goto found; - - if (volume_id_probe_lvm2(id, off, size) == 0) - goto found; - - if (volume_id_probe_highpoint_37x_raid(id, off, size) == 0) - goto found; - return -1; found: @@ -196,87 +223,17 @@ found: int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size) { + unsigned int i; + if (id == NULL) return -EINVAL; info("probing at offset 0x%llx, size 0x%llx", (unsigned long long) off, (unsigned long long) size); - if (volume_id_probe_vfat(id, off, size) == 0) - goto found; - - /* fill buffer with maximum */ - volume_id_get_buffer(id, 0, SB_BUFFER_SIZE); - - if (volume_id_probe_linux_swap(id, off, size) == 0) - goto found; - - if (volume_id_probe_luks(id, off, size) == 0) - goto found; - - if (volume_id_probe_xfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_ext(id, off, size) == 0) - goto found; - - if (volume_id_probe_reiserfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_jfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_udf(id, off, size) == 0) - goto found; - - if (volume_id_probe_iso9660(id, off, size) == 0) - goto found; - - if (volume_id_probe_hfs_hfsplus(id, off, size) == 0) - goto found; - - if (volume_id_probe_ufs(id, off, size) == 0) - goto found; - - if (volume_id_probe_ntfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_cramfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_romfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_hpfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_sysv(id, off, size) == 0) - goto found; - - if (volume_id_probe_minix(id, off, size) == 0) - goto found; - - if (volume_id_probe_ocfs1(id, off, size) == 0) - goto found; - - if (volume_id_probe_ocfs2(id, off, size) == 0) - goto found; - - if (volume_id_probe_vxfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_squashfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_netware(id, off, size) == 0) - goto found; - - if (volume_id_probe_gfs(id, off, size) == 0) - goto found; - - if (volume_id_probe_gfs2(id, off, size) == 0) - goto found; - + for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++) + if (prober_filesystem[i].prober(id, off, size) == 0) + goto found; return -1; found: @@ -290,6 +247,7 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) if (id == NULL) return -EINVAL; + /* probe for raid first, because fs probes may be successful on raid members */ if (volume_id_probe_raid(id, off, size) == 0) return 0; @@ -299,6 +257,25 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) return -1; } +void volume_id_all_probers(all_probers_fn_t all_probers_fn, + struct volume_id *id, uint64_t off, uint64_t size, + void *data) +{ + unsigned int i; + + if (all_probers_fn == NULL) + return; + + for (i = 0; i < ARRAY_SIZE(prober_raid); i++) + if (all_probers_fn(prober_raid[i].prober, id, off, size, data) != 0) + goto out; + for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++) + if (all_probers_fn(prober_filesystem[i].prober, id, off, size, data) != 0) + goto out; +out: + return; +} + /* open volume by already open file descriptor */ struct volume_id *volume_id_open_fd(int fd) {