X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvolume_id%2Fvolume_id.c;h=06496e7130d86421e698da77200a9cca919d78e2;hp=d1a6a5f0f51a50480760be6ecaf4ce136ba5b149;hb=79bd4f222954a331aafcd7d0164742a60b570294;hpb=9bd72b9b6b2645ea3c36ef0be9a070e8ff67904f diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/volume_id/volume_id.c index d1a6a5f0f..06496e713 100644 --- a/extras/volume_id/volume_id/volume_id.c +++ b/extras/volume_id/volume_id/volume_id.c @@ -58,7 +58,7 @@ #include "minix.h" #include "mac.h" #include "msdos.h" -#include "ocfs2.h" +#include "ocfs.h" int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) { @@ -156,9 +156,15 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size) if (volume_id_probe_minix(id, off) == 0) goto exit; + if (volume_id_probe_ocfs1(id, off) == 0) + goto exit; + if (volume_id_probe_ocfs2(id, off) == 0) goto exit; + if (volume_id_probe_vxfs(id, off) == 0) + goto exit; + return -1; exit: