libvolume_id: gfs + gfs2 support

[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 33fd890dfd61fdedba1369d2c46625a2e59419dd..bcdbe2feaaf1129a2b053ea1a9ae2a8d5408b2e8 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -69,6 +69,12 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
 
                if (volume_id_probe_highpoint_45x_raid(id, off, size) == 0)
                        goto found;
+
+               if (volume_id_probe_adaptec_raid(id, off, size) == 0)
+                       goto found;
+
+               if (volume_id_probe_jmicron_raid(id, off, size) == 0)
+                       goto found;
        }
 
        if (volume_id_probe_lvm1(id, off) == 0)
@@ -99,7 +105,6 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
        if (volume_id_probe_luks(id, off) == 0)
                goto found;
 
-       /* signature in the first block, only small buffer needed */
        if (volume_id_probe_vfat(id, off) == 0)
                goto found;
 
@@ -163,6 +168,15 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
        if (volume_id_probe_squashfs(id, off) == 0)
                goto found;
 
+       if (volume_id_probe_netware(id, off) == 0)
+               goto found;
+
+       if (volume_id_probe_gfs(id, off) == 0)
+               goto found;
+
+       if (volume_id_probe_gfs2(id, off) == 0)
+               goto found;
+
        return -1;
 
 found: