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=e7d4d75666aeaca6fbd5ff11820cf6c58f404f27;hb=79bd4f222954a331aafcd7d0164742a60b570294;hpb=853ccc433c4d45c3e1da4336f87b458ed10311ca;ds=sidebyside

diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/volume_id/volume_id.c
index e7d4d7566..06496e713 100644
--- a/extras/volume_id/volume_id/volume_id.c
+++ b/extras/volume_id/volume_id/volume_id.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	This library is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *	Lesser General Public License for more details.
- *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *	This program is free software; you can redistribute it and/or modify it
+ *	under the terms of the GNU General Public License as published by the
+ *	Free Software Foundation version 2 of the License.
  */
 
 #ifndef _GNU_SOURCE
@@ -68,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)
 {
@@ -118,9 +108,6 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 	if (volume_id_probe_vfat(id, off) == 0)
 		goto exit;
 
-	if (volume_id_probe_mac_partition_map(id, off) == 0)
-		goto exit;
-
 	if (volume_id_probe_xfs(id, off) == 0)
 		goto exit;
 
@@ -169,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: