{ volume_id_probe_hpfs, { "hpfs", } },
{ volume_id_probe_sysv, { "sysv", "xenix", } },
{ volume_id_probe_minix, { "minix", } },
+ { volume_id_probe_gfs, { "gfs", } },
+ { volume_id_probe_gfs2, { "gfs2", } },
{ 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", } },
+ { volume_id_probe_oracleasm, { "oracleasm", } },
};
/* the user can overwrite this log function */
volume_id_log_fn_t volume_id_log_fn = default_log;
/**
- * volume_id_get_label:
+ * volume_id_get_prober_by_type:
* @type: Type string.
*
* Lookup the probing function for a specific type.
}
/* run only once into a timeout for unreadable devices */
-static int device_is_readable(struct volume_id *id)
+static int device_is_readable(struct volume_id *id, uint64_t off)
{
- if (volume_id_get_buffer(id, 0x00, 0x200) != NULL)
+ if (volume_id_get_buffer(id, off, 0x200) != NULL)
return 1;
return 0;
}
if (id == NULL)
return -EINVAL;
- if (!device_is_readable(id))
+ if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx",
+ info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);
for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
if (id == NULL)
return -EINVAL;
- if (!device_is_readable(id))
+ if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx",
+ info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
if (id == NULL)
return -EINVAL;
- if (!device_is_readable(id))
+ if (!device_is_readable(id, off))
return -1;
/* probe for raid first, because fs probes may be successful on raid members */
fd = open(path, O_RDONLY);
if (fd < 0) {
- dbg("unable to open '%s'", path);
+ dbg("unable to open '%s'\n", path);
return NULL;
}