#include <sys/stat.h>
#include "libvolume_id.h"
+#include "libvolume_id-private.h"
#include "util.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
{ 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.
return 0;
}
+/* run only once into a timeout for unreadable devices */
+static int device_is_readable(struct volume_id *id, uint64_t off)
+{
+ if (volume_id_get_buffer(id, off, 0x200) != NULL)
+ return 1;
+ return 0;
+}
+
/**
* volume_id_probe_raid:
* @id: Probing context.
if (id == NULL)
return -EINVAL;
- info("probing at offset 0x%llx, size 0x%llx",
+ if (!device_is_readable(id, off))
+ return -1;
+
+ 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;
- info("probing at offset 0x%llx, size 0x%llx",
+ if (!device_is_readable(id, off))
+ return -1;
+
+ 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, off))
+ return -1;
+
/* probe for raid first, because fs probes may be successful on raid members */
if (volume_id_probe_raid(id, off, size) == 0)
return 0;
return id;
}
-struct volume_id *volume_id_open_node(const char *path)
-{
- struct volume_id *id;
- int fd;
-
- fd = open(path, O_RDONLY);
- if (fd < 0) {
- dbg("unable to open '%s'", path);
- return NULL;
- }
-
- id = volume_id_open_fd(fd);
- if (id == NULL)
- return NULL;
-
- /* close fd on device close */
- id->fd_close = 1;
-
- return id;
-}
-
/**
* volume_id_close:
* @id: Probing context.
if (id == NULL)
return;
- if (id->fd_close != 0)
- close(id->fd);
-
volume_id_free_buffer(id);
free(id);