X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Fvolume_id%2Fvolume_id.c;h=4c4a42a00d6ca1902727171fa71c088ea0f8574f;hb=70721db6d7ba0d4f3ac5c17f2cedac056065ad8a;hp=e1d4b1c92269ccaaddfab70abb12174db7f25958;hpb=c033fd9f01b3cd5771875069c26d3af06969a300;p=elogind.git

diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/volume_id/volume_id.c
index e1d4b1c92..4c4a42a00 100644
--- a/extras/volume_id/volume_id/volume_id.c
+++ b/extras/volume_id/volume_id/volume_id.c
@@ -35,37 +35,72 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
 
-#include "ext/ext.h"
-#include "reiserfs/reiserfs.h"
-#include "fat/fat.h"
-#include "hfs/hfs.h"
-#include "jfs/jfs.h"
-#include "xfs/xfs.h"
-#include "ufs/ufs.h"
-#include "ntfs/ntfs.h"
-#include "iso9660/iso9660.h"
-#include "udf/udf.h"
-#include "highpoint/highpoint.h"
-#include "linux_swap/linux_swap.h"
-#include "linux_raid/linux_raid.h"
-#include "lvm/lvm.h"
-#include "mac/mac.h"
-#include "msdos/msdos.h"
-
-int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned long long size)
+#include "ext.h"
+#include "reiserfs.h"
+#include "fat.h"
+#include "hfs.h"
+#include "jfs.h"
+#include "xfs.h"
+#include "ufs.h"
+#include "ntfs.h"
+#include "iso9660.h"
+#include "udf.h"
+#include "highpoint.h"
+#include "isw_raid.h"
+#include "lsi_raid.h"
+#include "via_raid.h"
+#include "silicon_raid.h"
+#include "nvidia_raid.h"
+#include "promise_raid.h"
+#include "luks.h"
+#include "linux_swap.h"
+#include "linux_raid.h"
+#include "lvm.h"
+#include "cramfs.h"
+#include "hpfs.h"
+#include "romfs.h"
+#include "sysv.h"
+#include "minix.h"
+#include "mac.h"
+#include "msdos.h"
+#include "ocfs2.h"
+
+int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	if (id == NULL)
 		return -EINVAL;
 
 	/* probe for raid first, cause fs probes may be successful on raid members */
-	if (volume_id_probe_linux_raid(id, off, size) == 0)
-		goto exit;
+	if (size) {
+		if (volume_id_probe_linux_raid(id, off, size) == 0)
+			goto exit;
+
+		if (volume_id_probe_intel_software_raid(id, off, size) == 0)
+			goto exit;
+
+		if (volume_id_probe_lsi_mega_raid(id, off, size) == 0)
+			goto exit;
+
+		if (volume_id_probe_via_raid(id, off, size) == 0)
+			goto exit;
+
+		if (volume_id_probe_silicon_medley_raid(id, off, size) == 0)
+			goto exit;
+
+		if (volume_id_probe_nvidia_raid(id, off, size) == 0)
+			goto exit;
+
+		if (volume_id_probe_promise_fasttrack_raid(id, off, size) == 0)
+			goto exit;
+
+		if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0)
+			goto exit;
+	}
 
 	if (volume_id_probe_lvm1(id, off) == 0)
 		goto exit;
@@ -73,7 +108,10 @@ int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned l
 	if (volume_id_probe_lvm2(id, off) == 0)
 		goto exit;
 
-	if (volume_id_probe_highpoint_ataraid(id, off) == 0)
+	if (volume_id_probe_highpoint_37x_raid(id, off) == 0)
+		goto exit;
+
+	if (volume_id_probe_luks(id, off) == 0)
 		goto exit;
 
 	/* signature in the first block, only small buffer needed */
@@ -116,6 +154,24 @@ int volume_id_probe_all(struct volume_id *id, unsigned long long off, unsigned l
 	if (volume_id_probe_ntfs(id, off)  == 0)
 		goto exit;
 
+	if (volume_id_probe_cramfs(id, off) == 0)
+		goto exit;
+
+	if (volume_id_probe_romfs(id, off) == 0)
+		goto exit;
+
+	if (volume_id_probe_hpfs(id, off) == 0)
+		goto exit;
+
+	if (volume_id_probe_sysv(id, off) == 0)
+		goto exit;
+
+	if (volume_id_probe_minix(id, off) == 0)
+		goto exit;
+
+	if (volume_id_probe_ocfs2(id, off) == 0)
+		goto exit;
+
 	return -1;
 
 exit:
@@ -167,7 +223,7 @@ struct volume_id *volume_id_open_node(const char *path)
 struct volume_id *volume_id_open_dev_t(dev_t devt)
 {
 	struct volume_id *id;
-	__u8 tmp_node[VOLUME_ID_PATH_MAX];
+	char tmp_node[VOLUME_ID_PATH_MAX];
 
 	snprintf(tmp_node, VOLUME_ID_PATH_MAX,
 		 "/dev/.volume_id-%u-%u-%u", getpid(), major(devt), minor(devt));