delete all Makefiles and move udev source to udev/

[elogind.git] / extras / volume_id / lib / volume_id.c

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index e8f6de35fdc607ca058c206c8ae1a6aa4c123b40..b247fe2ddbc0211afd165a2f59ae1d108153743c 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -70,11 +70,14 @@ static const struct prober prober_filesystem[] = {
        { 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 */
@@ -331,9 +334,9 @@ err:
 }
 
 /* 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;
 }
@@ -355,10 +358,10 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
        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++)
@@ -389,10 +392,10 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
        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++)
@@ -421,7 +424,7 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
        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 */
@@ -493,7 +496,7 @@ struct volume_id *volume_id_open_node(const char *path)
 
        fd = open(path, O_RDONLY);
        if (fd < 0) {
-               dbg("unable to open '%s'", path);
+               dbg("unable to open '%s'\n", path);
                return NULL;
        }