X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Fvolume_id%2Fvolume_id.c;h=25bcd953584ac781da73a29a8bfc51c98e451b0e;hb=0ecc6c1b1957e367852bf2dbf3fbc406762d272d;hp=32b91e65ca05397fe1675319abd479fa75b0190c;hpb=8d77c6a383ed1b308ce73e97b9f02f767b012921;p=elogind.git

diff --git a/extras/volume_id/volume_id/volume_id.c b/extras/volume_id/volume_id/volume_id.c
index 32b91e65c..25bcd9535 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)
 {
@@ -166,6 +156,9 @@ 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;