diff options
| -rw-r--r-- | extras/volume_id/lib/exported_symbols | 7 | ||||
| -rw-r--r-- | extras/volume_id/lib/libvolume_id.h | 46 | ||||
| -rw-r--r-- | extras/volume_id/lib/volume_id.c | 212 |
3 files changed, 128 insertions, 137 deletions
diff --git a/extras/volume_id/lib/exported_symbols b/extras/volume_id/lib/exported_symbols index d11634a948..3422152edb 100644 --- a/extras/volume_id/lib/exported_symbols +++ b/extras/volume_id/lib/exported_symbols @@ -10,11 +10,14 @@ volume_id_get_type_version; volume_id_open_fd; - volume_id_open_node; + volume_id_close; volume_id_probe_all; volume_id_probe_filesystem; volume_id_probe_raid; - volume_id_close; + volume_id_all_probers; + volume_id_get_prober_by_type; + + volume_id_open_node; volume_id_probe_linux_swap; volume_id_probe_luks; diff --git a/extras/volume_id/lib/libvolume_id.h b/extras/volume_id/lib/libvolume_id.h index adfc75cb99..c0ab29e0f7 100644 --- a/extras/volume_id/lib/libvolume_id.h +++ b/extras/volume_id/lib/libvolume_id.h @@ -16,9 +16,38 @@ typedef void (*volume_id_log_fn_t)(int priority, const char *file, int line, const char *format, ...) __attribute__ ((format(printf, 4, 5))); - extern volume_id_log_fn_t volume_id_log_fn; +struct volume_id; +typedef int (*volume_id_probe_fn_t)(struct volume_id *id, uint64_t off, uint64_t size); +typedef int (*all_probers_fn_t)(volume_id_probe_fn_t probe_fn, + struct volume_id *id, uint64_t off, uint64_t size, + void *data); + +extern struct volume_id *volume_id_open_fd(int fd); +extern void volume_id_close(struct volume_id *id); +extern int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size); +extern int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size); +extern const volume_id_probe_fn_t *volume_id_get_prober_by_type(const char *type); +extern void volume_id_all_probers(all_probers_fn_t all_probers_fn, + struct volume_id *id, uint64_t off, uint64_t size, + void *data); +extern int volume_id_get_label(struct volume_id *id, const char **label); +extern int volume_id_get_label_raw(struct volume_id *id, const uint8_t **label, size_t *len); +extern int volume_id_get_uuid(struct volume_id *id, const char **uuid); +extern int volume_id_get_uuid_raw(struct volume_id *id, const uint8_t **uuid, size_t *len); +extern int volume_id_get_usage(struct volume_id *id, const char **usage); +extern int volume_id_get_type(struct volume_id *id, const char **type); +extern int volume_id_get_type_version(struct volume_id *id, const char **type_version); + +/* + * Note: everything below will be made private or removed from + * a future version, and a new major release of libvolume_id + */ + +extern struct volume_id *volume_id_open_node(const char *path); + #define VOLUME_ID_LABEL_SIZE 64 #define VOLUME_ID_UUID_SIZE 36 #define VOLUME_ID_FORMAT_SIZE 32 @@ -56,21 +85,6 @@ struct volume_id { int fd_close:1; }; -extern int volume_id_get_label(struct volume_id *id, const char **label); -extern int volume_id_get_label_raw(struct volume_id *id, const uint8_t **label, size_t *len); -extern int volume_id_get_uuid(struct volume_id *id, const char **uuid); -extern int volume_id_get_uuid_raw(struct volume_id *id, const uint8_t **uuid, size_t *len); -extern int volume_id_get_usage(struct volume_id *id, const char **usage); -extern int volume_id_get_type(struct volume_id *id, const char **type); -extern int volume_id_get_type_version(struct volume_id *id, const char **type_version); - -extern struct volume_id *volume_id_open_fd(int fd); -extern struct volume_id *volume_id_open_node(const char *path); -extern int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size); -extern int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size); -extern int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size); -extern void volume_id_close(struct volume_id *id); - /* filesystems */ extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off, uint64_t size); extern int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size); diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c index a66b4a5769..42c67d905a 100644 --- a/extras/volume_id/lib/volume_id.c +++ b/extras/volume_id/lib/volume_id.c @@ -28,6 +28,57 @@ #include "libvolume_id.h" #include "util.h" +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +struct prober { + const char *type; + volume_id_probe_fn_t prober; +}; + +static const struct prober prober_raid[] = { + {"linux_raid_member", volume_id_probe_linux_raid }, + {"ddf_raid_member", volume_id_probe_ddf_raid }, + {"isw_raid_member", volume_id_probe_intel_software_raid }, + {"lsi_mega_raid_member", volume_id_probe_lsi_mega_raid }, + {"via_raid_member", volume_id_probe_via_raid }, + {"silicon_medley_raid_member", volume_id_probe_silicon_medley_raid }, + {"nvidia_raid_member", volume_id_probe_nvidia_raid }, + {"promise_fasttrack_raid_member", volume_id_probe_promise_fasttrack_raid }, + {"highpoint_raid_member", volume_id_probe_highpoint_45x_raid }, + {"adaptec_raid_member", volume_id_probe_adaptec_raid }, + {"jmicron_raid_member", volume_id_probe_jmicron_raid }, + {"LVM1_member", volume_id_probe_lvm1 }, + {"LVM2_member", volume_id_probe_lvm2 }, + {"highpoint_raid_member", volume_id_probe_highpoint_37x_raid }, +}; + +static const struct prober prober_filesystem[] = { + { "vfat", volume_id_probe_vfat }, + { "linux_swap", volume_id_probe_linux_swap }, + { "luks", volume_id_probe_luks }, + { "xfs", volume_id_probe_xfs }, + { "ext", volume_id_probe_ext }, + { "reiserfs", volume_id_probe_reiserfs }, + { "jfs", volume_id_probe_jfs }, + { "udf", volume_id_probe_udf }, + { "iso9660", volume_id_probe_iso9660 }, + { "hfs", volume_id_probe_hfs_hfsplus }, + { "ufs", volume_id_probe_ufs }, + { "ntfs", volume_id_probe_ntfs }, + { "cramfs", volume_id_probe_cramfs }, + { "romfs", volume_id_probe_romfs }, + { "hpfs", volume_id_probe_hpfs }, + { "sysv", volume_id_probe_sysv }, + { "minix", volume_id_probe_minix }, + { "ocfs1", volume_id_probe_ocfs1 }, + { "ocfs2", volume_id_probe_ocfs2 }, + { "vxfs", volume_id_probe_vxfs }, + { "squashfs", volume_id_probe_squashfs }, + { "netware", volume_id_probe_netware }, + { "gfs", volume_id_probe_gfs }, + { "gfs2", volume_id_probe_gfs2 }, +}; + /* the user can overwrite this log function */ static void default_log(int priority, const char *file, int line, const char *format, ...) { @@ -36,6 +87,19 @@ 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 i; + + for (i = 0; i < ARRAY_SIZE(prober_raid); i++) + if (strcmp(type, prober_raid[i].type) == 0) + return &prober_raid[i].prober; + for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++) + if (strcmp(type, prober_filesystem[i].type) == 0) + return &prober_filesystem[i].prober; + return NULL; +} + int volume_id_get_label(struct volume_id *id, const char **label) { if (id == NULL) @@ -135,57 +199,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) + for (i = 0; i < ARRAY_SIZE(prober_raid); i++) + if (prober_raid[i].prober(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) - 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 +220,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 +244,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 +254,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) { |