#include <ctype.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include <asm/types.h>
#include "volume_id.h"
#include "logging.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 "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, unsigned long long off, unsigned long long size)
+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;
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)
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:
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));
- tmp_node[VOLUME_ID_PATH_MAX] = '\0';
+ tmp_node[VOLUME_ID_PATH_MAX-1] = '\0';
/* create tempory node to open the block device */
unlink(tmp_node);