X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flibvolume_id%2Fvolume_id.h;h=15f1ac01f82587fa09062e78567eee0dd11007ee;hp=f2f3a0d0065d52e48144eb8bf09f08ce47bff44d;hb=2f567dd62ede3cf979e426738925446f1182ba52;hpb=f054627f500450a7aadeaf8a9930354fb268718e

diff --git a/extras/volume_id/libvolume_id/volume_id.h b/extras/volume_id/libvolume_id/volume_id.h
index f2f3a0d00..15f1ac01f 100644
--- a/extras/volume_id/libvolume_id/volume_id.h
+++ b/extras/volume_id/libvolume_id/volume_id.h
@@ -12,8 +12,13 @@
 #define _VOLUME_ID_H_
 
 #include <stdint.h>
+#include <stddef.h>
 
-#define VOLUME_ID_VERSION		53
+#define VOLUME_ID_VERSION		59
+
+#ifndef PACKED
+#define PACKED				__attribute__((packed))
+#endif
 
 #define VOLUME_ID_LABEL_SIZE		64
 #define VOLUME_ID_UUID_SIZE		36
@@ -68,6 +73,8 @@ struct volume_id {
 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 */
@@ -89,6 +96,7 @@ extern int volume_id_probe_udf(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off);
 extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_squashfs(struct volume_id *id, uint64_t off);
 
 /* special formats */
 extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off);